balint14/student-legacy
balint14/student-legacy
1
Fork 0
forked from firka/student-legacy
Code Pull Requests Activity

fixed deprecated warnings

Browse Source
This commit is contained in:
Marton Kiss 2025-01-31 10:24:37 +01:00
parent 67649cc5fd
commit b5ee1afe05
102 changed files with 755 additions and 557 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
refilc/lib/api/providers/live_card_provider.dart
View File

@ -85,8 +85,8 @@ class LiveCardProvider extends ChangeNotifier {
} }
Map<String, String> toMap() { Map<String, String> toMap() {
print("LIVE ACTIVITY COLOR BELOW:"); // print("LIVE ACTIVITY COLOR BELOW:");
print(_settings.liveActivityColor.toHexString().substring(2)); // print(_settings.liveActivityColor.toHexString().substring(2));
String color = '#${_settings.liveActivityColor.toHexString().substring(2)}'; String color = '#${_settings.liveActivityColor.toHexString().substring(2)}';
switch (currentState) { switch (currentState) {

46
refilc/lib/theme/theme.dart
View File

@ -115,42 +115,42 @@ class AppTheme {
primary: accent, primary: accent,
onPrimary: onPrimary:
(accent.computeLuminance() > 0.5 ? Colors.black : Colors.white) (accent.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9), .withValues(alpha: .9),
secondary: newSecondary, secondary: newSecondary,
onSecondary: (newSecondary.computeLuminance() > 0.5 onSecondary: (newSecondary.computeLuminance() > 0.5
? Colors.black ? Colors.black
: Colors.white) : Colors.white)
.withOpacity(.9), .withValues(alpha: .9),
tertiary: newTertiary, tertiary: newTertiary,
onTertiary: onTertiary:
(newTertiary.computeLuminance() > 0.5 ? Colors.black : Colors.white) (newTertiary.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9), .withValues(alpha: .9),
brightness: Brightness.light, brightness: Brightness.light,
error: lightColors.red, error: lightColors.red,
onError: Colors.white.withOpacity(.9), onError: Colors.white.withValues(alpha: .9),
surface: highlightColor, surface: highlightColor,
onSurface: Colors.black.withOpacity(.9), onSurface: Colors.black.withValues(alpha: .9),
), ),
shadowColor: lightColors.shadow.withOpacity(.5), shadowColor: lightColors.shadow.withValues(alpha: .5),
appBarTheme: AppBarTheme(backgroundColor: backgroundColor), appBarTheme: AppBarTheme(backgroundColor: backgroundColor),
indicatorColor: accent, indicatorColor: accent,
iconTheme: IconThemeData(color: lightColors.text.withOpacity(.75)), iconTheme: IconThemeData(color: lightColors.text.withValues(alpha: .75)),
navigationBarTheme: NavigationBarThemeData( navigationBarTheme: NavigationBarThemeData(
indicatorColor: indicatorColor: accent.withValues(
accent.withOpacity(accentColor == AccentColor.adaptive ? 0.4 : 0.8), alpha: accentColor == AccentColor.adaptive ? 0.4 : 0.8),
iconTheme: iconTheme:
WidgetStateProperty.all(IconThemeData(color: lightColors.text)), WidgetStateProperty.all(IconThemeData(color: lightColors.text)),
backgroundColor: highlightColor, backgroundColor: highlightColor,
labelTextStyle: WidgetStateProperty.all(TextStyle( labelTextStyle: WidgetStateProperty.all(TextStyle(
fontSize: 13.0, fontSize: 13.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: lightColors.text.withOpacity(0.8), color: lightColors.text.withValues(alpha: 0.8),
)), )),
labelBehavior: NavigationDestinationLabelBehavior.alwaysShow, labelBehavior: NavigationDestinationLabelBehavior.alwaysShow,
height: 76.0, height: 76.0,
), ),
sliderTheme: SliderThemeData( sliderTheme: SliderThemeData(
inactiveTrackColor: accent.withOpacity(.3), inactiveTrackColor: accent.withValues(alpha: .3),
), ),
progressIndicatorTheme: ProgressIndicatorThemeData(color: accent), progressIndicatorTheme: ProgressIndicatorThemeData(color: accent),
expansionTileTheme: ExpansionTileThemeData(iconColor: accent), expansionTileTheme: ExpansionTileThemeData(iconColor: accent),
@ -238,48 +238,48 @@ class AppTheme {
primary: accent, primary: accent,
onPrimary: onPrimary:
(accent.computeLuminance() > 0.5 ? Colors.black : Colors.white) (accent.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9), .withValues(alpha: .9),
secondary: newSecondary, secondary: newSecondary,
onSecondary: (newSecondary.computeLuminance() > 0.5 onSecondary: (newSecondary.computeLuminance() > 0.5
? Colors.black ? Colors.black
: Colors.white) : Colors.white)
.withOpacity(.9), .withValues(alpha: .9),
tertiary: newTertiary, tertiary: newTertiary,
onTertiary: onTertiary:
(newTertiary.computeLuminance() > 0.5 ? Colors.black : Colors.white) (newTertiary.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9), .withValues(alpha: .9),
brightness: Brightness.dark, brightness: Brightness.dark,
error: darkColors.red, error: darkColors.red,
onError: Colors.black.withOpacity(.9), onError: Colors.black.withValues(alpha: .9),
surface: highlightColor, surface: highlightColor,
onSurface: Colors.white.withOpacity(.9), onSurface: Colors.white.withValues(alpha: .9),
), ),
shadowColor: highlightColor.withOpacity(.5), //darkColors.shadow, shadowColor: highlightColor.withValues(alpha: .5), //darkColors.shadow,
appBarTheme: AppBarTheme(backgroundColor: backgroundColor), appBarTheme: AppBarTheme(backgroundColor: backgroundColor),
indicatorColor: accent, indicatorColor: accent,
iconTheme: IconThemeData(color: darkColors.text.withOpacity(.75)), iconTheme: IconThemeData(color: darkColors.text.withValues(alpha: .75)),
navigationBarTheme: NavigationBarThemeData( navigationBarTheme: NavigationBarThemeData(
indicatorColor: indicatorColor: accent.withValues(
accent.withOpacity(accentColor == AccentColor.adaptive ? 0.4 : 0.8), alpha: accentColor == AccentColor.adaptive ? 0.4 : 0.8),
iconTheme: iconTheme:
WidgetStateProperty.all(IconThemeData(color: darkColors.text)), WidgetStateProperty.all(IconThemeData(color: darkColors.text)),
backgroundColor: highlightColor, backgroundColor: highlightColor,
labelTextStyle: WidgetStateProperty.all(TextStyle( labelTextStyle: WidgetStateProperty.all(TextStyle(
fontSize: 13.0, fontSize: 13.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: darkColors.text.withOpacity(0.8), color: darkColors.text.withValues(alpha: 0.8),
)), )),
labelBehavior: NavigationDestinationLabelBehavior.alwaysShow, labelBehavior: NavigationDestinationLabelBehavior.alwaysShow,
height: 76.0, height: 76.0,
), ),
sliderTheme: SliderThemeData( sliderTheme: SliderThemeData(
inactiveTrackColor: accent.withOpacity(.3), inactiveTrackColor: accent.withValues(alpha: .3),
), ),
progressIndicatorTheme: ProgressIndicatorThemeData(color: accent), progressIndicatorTheme: ProgressIndicatorThemeData(color: accent),
expansionTileTheme: ExpansionTileThemeData(iconColor: accent), expansionTileTheme: ExpansionTileThemeData(iconColor: accent),
cardColor: highlightColor, cardColor: highlightColor,
chipTheme: ChipThemeData( chipTheme: ChipThemeData(
backgroundColor: accent.withOpacity(.2), backgroundColor: accent.withValues(alpha: .2),
elevation: 1, elevation: 1,
), ),
bottomNavigationBarTheme: BottomNavigationBarThemeData( bottomNavigationBarTheme: BottomNavigationBarThemeData(

2
refilc/lib/ui/filter/sort.dart
View File

@ -191,7 +191,7 @@ List<Widget> sortDateWidgets(
width: 150.0, width: 150.0,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12.0), borderRadius: BorderRadius.circular(12.0),
color: AppColors.of(context).text.withOpacity(.25), color: AppColors.of(context).text.withValues(alpha: .25),
), ),
), ),
), ),

7
refilc/lib/ui/filter/widgets.dart
View File

@ -178,8 +178,7 @@ Future<List<DateWidget>> getFilterWidgets(FilterType activeData,
// Ads // Ads
case FilterType.ads: case FilterType.ads:
if (adProvider.available) { if (adProvider.available) {
items = ad_filter.getWidgets( items = ad_filter.getWidgets(adProvider.ads, context);
adProvider.ads, context);
} }
break; break;
} }
@ -233,8 +232,8 @@ Widget filterItemBuilder(
BoxShadow( BoxShadow(
offset: const Offset(0, 21), offset: const Offset(0, 21),
blurRadius: 23.0, blurRadius: 23.0,
color: Theme.of(context).shadowColor.withOpacity( color: Theme.of(context).shadowColor.withValues(
Theme.of(context).shadowColor.opacity * alpha: Theme.of(context).shadowColor.opacity *
CurvedAnimation( CurvedAnimation(
parent: CurvedAnimation( parent: CurvedAnimation(
parent: animation, parent: animation,

2
refilc/lib/ui/flutter_colorpicker/block_picker.dart
View File

@ -73,7 +73,7 @@ Widget _defaultItemBuilder(
color: color, color: color,
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: color.withOpacity(0.8), color: color.withValues(alpha: 0.8),
offset: const Offset(1, 2), offset: const Offset(1, 2),
blurRadius: 5) blurRadius: 5)
], ],

2
refilc/lib/ui/flutter_colorpicker/colorpicker.dart
View File

@ -380,7 +380,7 @@ class FilcColorPickerState extends State<FilcColorPicker> {
fontSize: 16.0, fontSize: 16.0,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(isAdvancedView ? 1.0 : .5), .withValues(alpha: isAdvancedView ? 1.0 : .5),
), ),
), ),
], ],

30
refilc/lib/ui/flutter_colorpicker/palette.dart
View File

@ -210,32 +210,32 @@ class TrackPainter extends CustomPainter {
break; break;
case TrackType.red: case TrackType.red:
final List<Color> colors = [ final List<Color> colors = [
hsvColor.toColor().withRed(0).withOpacity(1.0), hsvColor.toColor().withRed(0).withValues(alpha: 1.0),
hsvColor.toColor().withRed(255).withOpacity(1.0), hsvColor.toColor().withRed(255).withValues(alpha: 1.0),
]; ];
Gradient gradient = LinearGradient(colors: colors); Gradient gradient = LinearGradient(colors: colors);
canvas.drawRect(rect, Paint()..shader = gradient.createShader(rect)); canvas.drawRect(rect, Paint()..shader = gradient.createShader(rect));
break; break;
case TrackType.green: case TrackType.green:
final List<Color> colors = [ final List<Color> colors = [
hsvColor.toColor().withGreen(0).withOpacity(1.0), hsvColor.toColor().withGreen(0).withValues(alpha: 1.0),
hsvColor.toColor().withGreen(255).withOpacity(1.0), hsvColor.toColor().withGreen(255).withValues(alpha: 1.0),
]; ];
Gradient gradient = LinearGradient(colors: colors); Gradient gradient = LinearGradient(colors: colors);
canvas.drawRect(rect, Paint()..shader = gradient.createShader(rect)); canvas.drawRect(rect, Paint()..shader = gradient.createShader(rect));
break; break;
case TrackType.blue: case TrackType.blue:
final List<Color> colors = [ final List<Color> colors = [
hsvColor.toColor().withBlue(0).withOpacity(1.0), hsvColor.toColor().withBlue(0).withValues(alpha: 1.0),
hsvColor.toColor().withBlue(255).withOpacity(1.0), hsvColor.toColor().withBlue(255).withValues(alpha: 1.0),
]; ];
Gradient gradient = LinearGradient(colors: colors); Gradient gradient = LinearGradient(colors: colors);
canvas.drawRect(rect, Paint()..shader = gradient.createShader(rect)); canvas.drawRect(rect, Paint()..shader = gradient.createShader(rect));
break; break;
case TrackType.alpha: case TrackType.alpha:
final List<Color> colors = [ final List<Color> colors = [
hsvColor.toColor().withOpacity(0.0), hsvColor.toColor().withValues(alpha: 0.0),
hsvColor.toColor().withOpacity(1.0), hsvColor.toColor().withValues(alpha: 1.0),
]; ];
Gradient gradient = LinearGradient(colors: colors); Gradient gradient = LinearGradient(colors: colors);
canvas.drawRect(rect, Paint()..shader = gradient.createShader(rect)); canvas.drawRect(rect, Paint()..shader = gradient.createShader(rect));
@ -390,7 +390,7 @@ class ColorPickerInputState extends State<ColorPickerInput> {
), ),
contentPadding: contentPadding:
const EdgeInsets.symmetric(vertical: 8.0, horizontal: 8.0), const EdgeInsets.symmetric(vertical: 8.0, horizontal: 8.0),
fillColor: AppColors.of(context).text.withOpacity(.1), fillColor: AppColors.of(context).text.withValues(alpha: .1),
), ),
onChanged: (String value) { onChanged: (String value) {
String input = value; String input = value;
@ -603,20 +603,20 @@ class ColorPickerSlider extends StatelessWidget {
break; break;
case TrackType.red: case TrackType.red:
thumbOffset += (box.maxWidth - 30.0) * hsvColor.toColor().red / 0xff; thumbOffset += (box.maxWidth - 30.0) * hsvColor.toColor().red / 0xff;
thumbColor = hsvColor.toColor().withOpacity(1.0); thumbColor = hsvColor.toColor().withValues(alpha: 1.0);
break; break;
case TrackType.green: case TrackType.green:
thumbOffset += thumbOffset +=
(box.maxWidth - 30.0) * hsvColor.toColor().green / 0xff; (box.maxWidth - 30.0) * hsvColor.toColor().green / 0xff;
thumbColor = hsvColor.toColor().withOpacity(1.0); thumbColor = hsvColor.toColor().withValues(alpha: 1.0);
break; break;
case TrackType.blue: case TrackType.blue:
thumbOffset += (box.maxWidth - 30.0) * hsvColor.toColor().blue / 0xff; thumbOffset += (box.maxWidth - 30.0) * hsvColor.toColor().blue / 0xff;
thumbColor = hsvColor.toColor().withOpacity(1.0); thumbColor = hsvColor.toColor().withValues(alpha: 1.0);
break; break;
case TrackType.alpha: case TrackType.alpha:
thumbOffset += (box.maxWidth - 30.0) * hsvColor.toColor().opacity; thumbOffset += (box.maxWidth - 30.0) * hsvColor.toColor().opacity;
thumbColor = hsvColor.toColor().withOpacity(hsvColor.alpha); thumbColor = hsvColor.toColor().withValues(alpha: hsvColor.alpha);
break; break;
} }
@ -709,8 +709,8 @@ class ColorIndicator extends StatelessWidget {
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: useWhiteForeground(color) color: useWhiteForeground(color)
? Colors.white.withOpacity(.5) ? Colors.white.withValues(alpha: .5)
: Colors.black.withOpacity(.5), : Colors.black.withValues(alpha: .5),
offset: const Offset(0, 0), offset: const Offset(0, 0),
blurRadius: 5) blurRadius: 5)
], ],

7
refilc/lib/ui/widgets/grade/grade_tile.dart
View File

@ -199,7 +199,7 @@ class GradeTile extends StatelessWidget {
: Icon( : Icon(
SubjectIcon.resolveVariant( SubjectIcon.resolveVariant(
context: context, subject: grade.subject), context: context, subject: grade.subject),
color: AppColors.of(context).text.withOpacity(.5), color: AppColors.of(context).text.withValues(alpha: .5),
), ),
minLeadingWidth: isSubjectView ? 32.0 : 0, minLeadingWidth: isSubjectView ? 32.0 : 0,
), ),
@ -288,7 +288,8 @@ class GradeValueWidget extends StatelessWidget {
shadows: [ shadows: [
if (value.weight >= 200) if (value.weight >= 200)
Shadow( Shadow(
color: (contrast ? Colors.white : color).withOpacity(.4), color:
(contrast ? Colors.white : color).withValues(alpha: .4),
offset: const Offset(-4, -3), offset: const Offset(-4, -3),
) )
], ],
@ -312,7 +313,7 @@ class GradeValueWidget extends StatelessWidget {
width: size * 1.4, width: size * 1.4,
height: size * 1.4, height: size * 1.4,
decoration: BoxDecoration( decoration: BoxDecoration(
color: color.withOpacity(contrast ? 1.0 : .25), color: color.withValues(alpha: contrast ? 1.0 : .25),
shape: BoxShape.circle, shape: BoxShape.circle,
boxShadow: [ boxShadow: [
if (shadow && if (shadow &&

54
refilc/lib/ui/widgets/lesson/lesson_tile.dart
View File

@ -75,7 +75,7 @@ class LessonTile extends StatelessWidget {
} }
if (lesson.isEmpty) { if (lesson.isEmpty) {
accent = AppColors.of(context).text.withOpacity(0.6); accent = AppColors.of(context).text.withValues(alpha: 0.6);
} }
if (!lesson.studentPresence) { if (!lesson.studentPresence) {
@ -182,9 +182,8 @@ class LessonTile extends StatelessWidget {
fontSize: 16.5, fontSize: 16.5,
color: fill color: fill
? accent ? accent
: AppColors.of(context) : AppColors.of(context).text.withValues(
.text alpha: !lesson.isEmpty ? 1.0 : 0.5),
.withOpacity(!lesson.isEmpty ? 1.0 : 0.5),
fontStyle: lesson.subject.isRenamed && fontStyle: lesson.subject.isRenamed &&
settingsProvider.renamedSubjectsItalics settingsProvider.renamedSubjectsItalics
? FontStyle.italic ? FontStyle.italic
@ -199,8 +198,10 @@ class LessonTile extends StatelessWidget {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14.0, fontSize: 14.0,
color: fill color: fill
? accent.withOpacity(.9) ? accent.withValues(alpha: .9)
: AppColors.of(context).text.withOpacity(.9), : AppColors.of(context)
.text
.withValues(alpha: .9),
), ),
), ),
), ),
@ -217,7 +218,7 @@ class LessonTile extends StatelessWidget {
// color: Theme.of(context) // color: Theme.of(context)
// .colorScheme // .colorScheme
// .secondary // .secondary
// .withOpacity(.15), // .withValues(alpha: .15),
// borderRadius: BorderRadius.circular(10.0), // borderRadius: BorderRadius.circular(10.0),
// ), // ),
// child: Text( // child: Text(
@ -229,7 +230,7 @@ class LessonTile extends StatelessWidget {
// color: Theme.of(context) // color: Theme.of(context)
// .colorScheme // .colorScheme
// .secondary // .secondary
// .withOpacity(.9), // .withValues(alpha: .9),
// ), // ),
// ), // ),
// ) // )
@ -246,11 +247,11 @@ class LessonTile extends StatelessWidget {
horizontal: 5.5, vertical: 3.0), horizontal: 5.5, vertical: 3.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: fill color: fill
? accent.withOpacity(.15) ? accent.withValues(alpha: .15)
: Theme.of(context) : Theme.of(context)
.colorScheme .colorScheme
.tertiary .tertiary
.withOpacity(.15), .withValues(alpha: .15),
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(10.0),
), ),
child: Text( child: Text(
@ -261,11 +262,11 @@ class LessonTile extends StatelessWidget {
fontSize: 12.0, fontSize: 12.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: fill color: fill
? accent.withOpacity(0.9) ? accent.withValues(alpha: 0.9)
: Theme.of(context) : Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.9), .withValues(alpha: .9),
), ),
), ),
), ),
@ -277,7 +278,9 @@ class LessonTile extends StatelessWidget {
textAlign: TextAlign.start, textAlign: TextAlign.start,
style: TextStyle( style: TextStyle(
fontSize: 14.0, fontSize: 14.0,
color: fill ? accent.withOpacity(0.5) : null, color: fill
? accent.withValues(alpha: 0.5)
: null,
), ),
), ),
], ],
@ -344,7 +347,7 @@ class LessonTile extends StatelessWidget {
? Theme.of(context) ? Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.3) .withValues(alpha: .3)
: const Color(0x00000000), : const Color(0x00000000),
borderRadius: BorderRadius.circular(12.0), borderRadius: BorderRadius.circular(12.0),
boxShadow: [ boxShadow: [
@ -353,7 +356,7 @@ class LessonTile extends StatelessWidget {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.25), .withValues(alpha: .25),
blurRadius: 6.0, blurRadius: 6.0,
) )
], ],
@ -386,7 +389,7 @@ class LessonTile extends StatelessWidget {
// fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
// color: AppColors.of(context) // color: AppColors.of(context)
// .text // .text
// .withOpacity(.75), // .withValues(alpha: .75),
// ), // ),
// ), // ),
// ), // ),
@ -398,11 +401,11 @@ class LessonTile extends StatelessWidget {
horizontal: 6.0, vertical: 3.5), horizontal: 6.0, vertical: 3.5),
decoration: BoxDecoration( decoration: BoxDecoration(
color: fill color: fill
? accent.withOpacity(.15) ? accent.withValues(alpha: .15)
: Theme.of(context) : Theme.of(context)
.colorScheme .colorScheme
.tertiary .tertiary
.withOpacity(.15), .withValues(alpha: .15),
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(10.0),
), ),
child: Text( child: Text(
@ -413,11 +416,11 @@ class LessonTile extends StatelessWidget {
fontSize: 12.5, fontSize: 12.5,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: fill color: fill
? accent.withOpacity(0.9) ? accent.withValues(alpha: 0.9)
: Theme.of(context) : Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.9), .withValues(alpha: .9),
), ),
), ),
), ),
@ -438,10 +441,10 @@ class LessonTile extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: fill color: fill
? accent.withOpacity(.9) ? accent.withValues(alpha: .9)
: AppColors.of(context) : AppColors.of(context)
.text .text
.withOpacity(.9), .withValues(alpha: .9),
), ),
), ),
], ],
@ -502,8 +505,8 @@ class LessonSubtile extends StatelessWidget {
Center( Center(
child: SizedBox( child: SizedBox(
width: 30.0, width: 30.0,
child: child: Icon(icon,
Icon(icon, color: iconColor.withOpacity(.75), size: 20.0), color: iconColor.withValues(alpha: .75), size: 20.0),
), ),
), ),
Expanded( Expanded(
@ -515,7 +518,8 @@ class LessonSubtile extends StatelessWidget {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context).text.withOpacity(.65)), color:
AppColors.of(context).text.withValues(alpha: .65)),
), ),
), ),
), ),

11
refilc/lib/ui/widgets/message/message_tile.dart
View File

@ -58,7 +58,8 @@ class MessageTile extends StatelessWidget {
width: 105, width: 105,
height: 15, height: 15,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.85), color:
AppColors.of(context).text.withValues(alpha: .85),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
), ),
@ -89,7 +90,8 @@ class MessageTile extends StatelessWidget {
width: 150, width: 150,
height: 10, height: 10,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.45), color:
AppColors.of(context).text.withValues(alpha: .45),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
), ),
@ -109,7 +111,8 @@ class MessageTile extends StatelessWidget {
width: 35, width: 35,
height: 15, height: 15,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.45), color:
AppColors.of(context).text.withValues(alpha: .45),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
), ),
@ -120,7 +123,7 @@ class MessageTile extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 14.0, fontSize: 14.0,
color: AppColors.of(context).text.withOpacity(.75), color: AppColors.of(context).text.withValues(alpha: .75),
), ),
), ),
), ),

12
refilc_mobile_ui/lib/common/action_button.dart
View File

@ -1,7 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class ActionButton extends StatelessWidget { class ActionButton extends StatelessWidget {
const ActionButton({super.key, required this.label, this.activeColor, this.onTap}); const ActionButton(
{super.key, required this.label, this.activeColor, this.onTap});
final Color? activeColor; final Color? activeColor;
final void Function()? onTap; final void Function()? onTap;
@ -19,7 +20,8 @@ class ActionButton extends StatelessWidget {
curve: Curves.easeInOut, curve: Curves.easeInOut,
height: 32.0, height: 32.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: (activeColor ?? Theme.of(context).colorScheme.secondary).withOpacity(0.25), color: (activeColor ?? Theme.of(context).colorScheme.secondary)
.withValues(alpha: 0.25),
borderRadius: BorderRadius.circular(6.0), borderRadius: BorderRadius.circular(6.0),
), ),
padding: const EdgeInsets.symmetric(vertical: 6.0, horizontal: 12.0), padding: const EdgeInsets.symmetric(vertical: 6.0, horizontal: 12.0),
@ -28,7 +30,11 @@ class ActionButton extends StatelessWidget {
maxLines: 1, maxLines: 1,
softWrap: false, softWrap: false,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.w600, color: activeColor ?? Theme.of(context).colorScheme.secondary))), style: TextStyle(
fontSize: 15.0,
fontWeight: FontWeight.w600,
color: activeColor ??
Theme.of(context).colorScheme.secondary))),
), ),
), ),
); );

12
refilc_mobile_ui/lib/common/average_display.dart
View File

@ -21,7 +21,7 @@ class AverageDisplay extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Color color = average == 0.0 Color color = average == 0.0
? AppColors.of(context).text.withOpacity(.8) ? AppColors.of(context).text.withValues(alpha: .8)
: gradeColor(context: context, value: average); : gradeColor(context: context, value: average);
String averageText = average.toStringAsFixed(2); String averageText = average.toStringAsFixed(2);
@ -49,16 +49,18 @@ class AverageDisplay extends StatelessWidget {
borderRadius: borderRadius:
(border && dashed) ? null : BorderRadius.circular(45.0 * scale), (border && dashed) ? null : BorderRadius.circular(45.0 * scale),
border: border && !dashed border: border && !dashed
? Border.fromBorderSide( ? Border.fromBorderSide(BorderSide(
BorderSide(color: color.withOpacity(.5), width: 1.0 * scale)) color: color.withValues(alpha: .5), width: 1.0 * scale))
: null,
color: !border
? color.withValues(alpha: average == 0.0 ? .15 : .25)
: null, : null,
color: !border ? color.withOpacity(average == 0.0 ? .15 : .25) : null,
), ),
child: (border && dashed) child: (border && dashed)
? DottedBorder( ? DottedBorder(
strokeWidth: 1.0 * scale, strokeWidth: 1.0 * scale,
padding: EdgeInsets.all(4.0 * scale), padding: EdgeInsets.all(4.0 * scale),
color: color.withOpacity(.5), color: color.withValues(alpha: .5),
dashPattern: const [6, 6], dashPattern: const [6, 6],
radius: Radius.circular(45.0 * scale), radius: Radius.circular(45.0 * scale),
borderType: BorderType.RRect, borderType: BorderType.RRect,

2
refilc_mobile_ui/lib/common/bottom_card.dart
View File

@ -25,7 +25,7 @@ class BottomCard extends StatelessWidget {
margin: const EdgeInsets.only(top: 12.0, bottom: 4.0), margin: const EdgeInsets.only(top: 12.0, bottom: 4.0),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(45.0), borderRadius: BorderRadius.circular(45.0),
color: AppColors.of(context).text.withOpacity(0.10), color: AppColors.of(context).text.withValues(alpha: 0.10),
), ),
), ),
if (child != null) child!, if (child != null) child!,

2
refilc_mobile_ui/lib/common/bottom_sheet_menu/rounded_bottom_sheet.dart
View File

@ -38,7 +38,7 @@ class RoundedBottomSheet extends StatelessWidget {
margin: const EdgeInsets.only(top: 12.0, bottom: 4.0), margin: const EdgeInsets.only(top: 12.0, bottom: 4.0),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(45.0), borderRadius: BorderRadius.circular(45.0),
color: AppColors.of(context).text.withOpacity(0.10), color: AppColors.of(context).text.withValues(alpha: 0.10),
), ),
), ),
if (child != null) child!, if (child != null) child!,

4
refilc_mobile_ui/lib/common/chips/beta_chip.dart
View File

@ -16,7 +16,7 @@ class BetaChip extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
color: !disabled color: !disabled
? Theme.of(context).colorScheme.secondary ? Theme.of(context).colorScheme.secondary
: AppColors.of(context).text.withOpacity(.25), : AppColors.of(context).text.withValues(alpha: .25),
borderRadius: BorderRadius.circular(40), borderRadius: BorderRadius.circular(40),
), ),
child: Padding( child: Padding(
@ -28,7 +28,7 @@ class BetaChip extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 10,
color: disabled color: disabled
? AppColors.of(context).text.withOpacity(.5) ? AppColors.of(context).text.withValues(alpha: .5)
: Colors.white, : Colors.white,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,

9
refilc_mobile_ui/lib/common/chips/new_chip.dart
View File

@ -11,8 +11,9 @@ class NewChip extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: color: disabled
disabled ? AppColors.of(context).text.withOpacity(.25) : Colors.red, ? AppColors.of(context).text.withValues(alpha: .25)
: Colors.red,
borderRadius: BorderRadius.circular(12.0), borderRadius: BorderRadius.circular(12.0),
), ),
padding: padding:
@ -23,7 +24,7 @@ class NewChip extends StatelessWidget {
Icon( Icon(
Icons.hotel_class_rounded, Icons.hotel_class_rounded,
color: disabled color: disabled
? AppColors.of(context).text.withOpacity(.5) ? AppColors.of(context).text.withValues(alpha: .5)
: Colors.white, : Colors.white,
size: 14.0, size: 14.0,
), ),
@ -32,7 +33,7 @@ class NewChip extends StatelessWidget {
'new'.i18n, 'new'.i18n,
style: TextStyle( style: TextStyle(
color: disabled color: disabled
? AppColors.of(context).text.withOpacity(.5) ? AppColors.of(context).text.withValues(alpha: .5)
: Colors.white, : Colors.white,
fontSize: 12.0, fontSize: 12.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

2
refilc_mobile_ui/lib/common/custom_snack_bar.dart
View File

@ -24,7 +24,7 @@ SnackBar CustomSnackBar({
color: _backgroundColor, color: _backgroundColor,
borderRadius: BorderRadius.circular(6.0), borderRadius: BorderRadius.circular(6.0),
boxShadow: [ boxShadow: [
BoxShadow(color: Colors.black.withOpacity(.15), blurRadius: 4.0) BoxShadow(color: Colors.black.withValues(alpha: .15), blurRadius: 4.0)
], ],
), ),
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),

2
refilc_mobile_ui/lib/common/detail.dart
View File

@ -26,7 +26,7 @@ class Detail extends StatelessWidget {
text: description, text: description,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context).text.withOpacity(0.85)), color: AppColors.of(context).text.withValues(alpha: 0.85)),
), ),
], ],
), ),

6
refilc_mobile_ui/lib/common/empty.dart
View File

@ -34,7 +34,7 @@ class Empty extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 32.0, fontSize: 32.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context).text.withOpacity(.75)), color: AppColors.of(context).text.withValues(alpha: .75)),
children: subtitle != null children: subtitle != null
? [ ? [
TextSpan( TextSpan(
@ -42,7 +42,9 @@ class Empty extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 18.0, fontSize: 18.0,
height: 2.0, height: 2.0,
color: AppColors.of(context).text.withOpacity(.5))) color: AppColors.of(context)
.text
.withValues(alpha: .5)))
] ]
: [], : [],
), ),

6
refilc_mobile_ui/lib/common/filter_bar.dart
View File

@ -56,12 +56,12 @@ class _FilterBarState extends State<FilterBar> {
), ),
labelPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 3), labelPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 3),
labelColor: Theme.of(context).colorScheme.secondary, labelColor: Theme.of(context).colorScheme.secondary,
unselectedLabelColor: AppColors.of(context).text.withOpacity(0.65), unselectedLabelColor: AppColors.of(context).text.withValues(alpha: 0.65),
// indicator // indicator
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.tab,
indicatorPadding: const EdgeInsets.symmetric(vertical: 8.0), indicatorPadding: const EdgeInsets.symmetric(vertical: 8.0),
indicator: BoxDecoration( indicator: BoxDecoration(
color: Theme.of(context).colorScheme.tertiary.withOpacity(.2), color: Theme.of(context).colorScheme.tertiary.withValues(alpha: .2),
borderRadius: BorderRadius.circular(45.0), borderRadius: BorderRadius.circular(45.0),
), ),
overlayColor: WidgetStateProperty.all(const Color(0x00000000)), overlayColor: WidgetStateProperty.all(const Color(0x00000000)),
@ -77,7 +77,7 @@ class _FilterBarState extends State<FilterBar> {
width: e, width: e,
height: 15, height: 15,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.45), color: AppColors.of(context).text.withValues(alpha: .45),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
), ),

14
refilc_mobile_ui/lib/common/hero_scrollview.dart
View File

@ -79,7 +79,7 @@ class HeroScrollViewState extends State<HeroScrollView> {
child: Row( child: Row(
children: [ children: [
Icon(widget.icon, Icon(widget.icon,
color: AppColors.of(context).text.withOpacity(.8)), color: AppColors.of(context).text.withValues(alpha: .8)),
const SizedBox(width: 8.0), const SizedBox(width: 8.0),
Expanded( Expanded(
child: Text( child: Text(
@ -123,7 +123,7 @@ class HeroScrollViewState extends State<HeroScrollView> {
Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary,
amount: 0.1, amount: 0.1,
) )
.withOpacity(0.4), .withValues(alpha: 0.4),
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
@ -135,10 +135,10 @@ class HeroScrollViewState extends State<HeroScrollView> {
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
Theme.of(context) Theme.of(context)
.scaffoldBackgroundColor .scaffoldBackgroundColor
.withOpacity(0.1), .withValues(alpha: 0.1),
Theme.of(context) Theme.of(context)
.scaffoldBackgroundColor .scaffoldBackgroundColor
.withOpacity(0.1), .withValues(alpha: 0.1),
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
], ],
stops: const [0.1, 0.5, 0.7, 0.98], stops: const [0.1, 0.5, 0.7, 0.98],
@ -164,7 +164,7 @@ class HeroScrollViewState extends State<HeroScrollView> {
Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary,
amount: 0.1, amount: 0.1,
) )
.withOpacity(0.9), .withValues(alpha: 0.9),
width: 1.5, width: 1.5,
padding: 12.0, padding: 12.0,
icon: Icon( icon: Icon(
@ -175,7 +175,7 @@ class HeroScrollViewState extends State<HeroScrollView> {
Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary,
amount: 0.1, amount: 0.1,
) )
.withOpacity(0.8), .withValues(alpha: 0.8),
), ),
), ),
), ),
@ -192,7 +192,7 @@ class HeroScrollViewState extends State<HeroScrollView> {
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: 26.0, fontSize: 26.0,
color: AppColors.of(context).text.withOpacity(.8), color: AppColors.of(context).text.withValues(alpha: .8),
fontStyle: widget.italic ? FontStyle.italic : null, fontStyle: widget.italic ? FontStyle.italic : null,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),

3
refilc_mobile_ui/lib/common/material_action_button.dart
View File

@ -19,7 +19,8 @@ class MaterialActionButton extends StatelessWidget {
return RawMaterialButton( return RawMaterialButton(
padding: const EdgeInsets.symmetric(horizontal: 16.0), padding: const EdgeInsets.symmetric(horizontal: 16.0),
shape: const StadiumBorder(), shape: const StadiumBorder(),
fillColor: backgroundColor ?? AppColors.of(context).text.withOpacity(.15), fillColor:
backgroundColor ?? AppColors.of(context).text.withValues(alpha: .15),
elevation: 0, elevation: 0,
highlightElevation: 0, highlightElevation: 0,
onPressed: onPressed, onPressed: onPressed,

3
refilc_mobile_ui/lib/common/outlined_round_button.dart
View File

@ -24,7 +24,8 @@ class OutlinedRoundButton extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface, color: Theme.of(context).colorScheme.surface,
border: Border.all( border: Border.all(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.1), color:
Theme.of(context).colorScheme.secondary.withValues(alpha: 0.1),
width: 1.1, width: 1.1,
), ),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),

2
refilc_mobile_ui/lib/common/panel/panel.dart
View File

@ -67,7 +67,7 @@ class PanelTitle extends StatelessWidget {
child: DefaultTextStyle( child: DefaultTextStyle(
style: Theme.of(context).textTheme.titleMedium!.copyWith( style: Theme.of(context).textTheme.titleMedium!.copyWith(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColors.of(context).text.withOpacity(0.65)), color: AppColors.of(context).text.withValues(alpha: 0.65)),
child: title, child: title,
), ),
); );

16
refilc_mobile_ui/lib/common/panel/panel_action_button.dart
View File

@ -23,18 +23,28 @@ class PanelActionButton extends StatelessWidget {
padding: padding, padding: padding,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
side: BorderSide(color: Theme.of(context).colorScheme.secondary.withOpacity(.6), width: 2), side: BorderSide(
color:
Theme.of(context).colorScheme.secondary.withValues(alpha: .6),
width: 2),
), ),
child: ListTile( child: ListTile(
leading: leading != null leading: leading != null
? Theme( ? Theme(
data: Theme.of(context).copyWith(iconTheme: IconThemeData(color: Theme.of(context).colorScheme.secondary)), data: Theme.of(context).copyWith(
iconTheme: IconThemeData(
color: Theme.of(context).colorScheme.secondary)),
child: leading!, child: leading!,
) )
: null, : null,
trailing: trailing, trailing: trailing,
title: title != null title: title != null
? DefaultTextStyle(style: Theme.of(context).textTheme.titleMedium!.copyWith(fontWeight: FontWeight.w500, fontSize: 15.0), child: title!) ? DefaultTextStyle(
style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(fontWeight: FontWeight.w500, fontSize: 15.0),
child: title!)
: null, : null,
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,

7
refilc_mobile_ui/lib/common/panel/panel_button.dart
View File

@ -36,8 +36,9 @@ class PanelButton extends StatelessWidget {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: borderRadius ?? BorderRadius.circular(12.0)), borderRadius: borderRadius ?? BorderRadius.circular(12.0)),
fillColor: background fillColor: background
? Colors.white.withOpacity( ? Colors.white.withValues(
Theme.of(context).brightness == Brightness.light ? .35 : .2) alpha:
Theme.of(context).brightness == Brightness.light ? .35 : .2)
: null, : null,
child: ListTile( child: ListTile(
leading: leading != null leading: leading != null
@ -57,7 +58,7 @@ class PanelButton extends StatelessWidget {
width: 2.0, width: 2.0,
height: 32.0, height: 32.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.15), color: AppColors.of(context).text.withValues(alpha: .15),
borderRadius: BorderRadius.circular(45.0), borderRadius: BorderRadius.circular(45.0),
), ),
), ),

6
refilc_mobile_ui/lib/common/personality_card/empty_card.dart
View File

@ -44,7 +44,7 @@ class _EmptyCardState extends State<EmptyCard> {
if (Provider.of<SettingsProvider>(context, listen: false) if (Provider.of<SettingsProvider>(context, listen: false)
.shadowEffect) .shadowEffect)
BoxShadow( BoxShadow(
color: Colors.black.withOpacity(0.08), color: Colors.black.withValues(alpha: 0.08),
offset: const Offset(0, 5), offset: const Offset(0, 5),
blurRadius: 20, blurRadius: 20,
spreadRadius: 10, spreadRadius: 10,
@ -52,7 +52,7 @@ class _EmptyCardState extends State<EmptyCard> {
], ],
), ),
child: DottedBorder( child: DottedBorder(
color: Colors.black.withOpacity(0.9), color: Colors.black.withValues(alpha: 0.9),
dashPattern: const [12, 12], dashPattern: const [12, 12],
padding: padding:
const EdgeInsets.only(top: 20, bottom: 20, left: 20, right: 20), const EdgeInsets.only(top: 20, bottom: 20, left: 20, right: 20),
@ -60,7 +60,7 @@ class _EmptyCardState extends State<EmptyCard> {
child: Text( child: Text(
widget.text, widget.text,
style: TextStyle( style: TextStyle(
color: Colors.white.withOpacity(0.9), color: Colors.white.withValues(alpha: 0.9),
), ),
), ),
), ),

6
refilc_mobile_ui/lib/common/personality_card/personality_card.dart
View File

@ -301,7 +301,7 @@ class _PersonalityCardState extends State<PersonalityCard> {
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
height: 1.2, height: 1.2,
color: Colors.white.withOpacity(0.8), color: Colors.white.withValues(alpha: 0.8),
), ),
), ),
const SizedBox(height: 25), const SizedBox(height: 25),
@ -354,7 +354,7 @@ class _PersonalityCardState extends State<PersonalityCard> {
borderRadius: const BorderRadius.all(Radius.circular(5)), borderRadius: const BorderRadius.all(Radius.circular(5)),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black.withOpacity(0.08), color: Colors.black.withValues(alpha: 0.08),
offset: const Offset(0, 5), offset: const Offset(0, 5),
blurRadius: 20, blurRadius: 20,
spreadRadius: 10, spreadRadius: 10,
@ -362,7 +362,7 @@ class _PersonalityCardState extends State<PersonalityCard> {
], ],
), ),
child: DottedBorder( child: DottedBorder(
color: Colors.black.withOpacity(0.9), color: Colors.black.withValues(alpha: 0.9),
dashPattern: const [12, 12], dashPattern: const [12, 12],
padding: padding:
const EdgeInsets.only(top: 20, bottom: 20, left: 20, right: 20), const EdgeInsets.only(top: 20, bottom: 20, left: 20, right: 20),

10
refilc_mobile_ui/lib/common/profile_image/profile_image.dart
View File

@ -91,10 +91,10 @@ class _ProfileImageState extends State<ProfileImage> {
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
shape: const CircleBorder(), shape: const CircleBorder(),
color: widget.name != null && widget.name! == 'Rendszerüzenet' color: widget.name != null && widget.name! == 'Rendszerüzenet'
? widget.backgroundColor?.withOpacity(0.8) ?? ? widget.backgroundColor?.withValues(alpha: 0.8) ??
AppColors.of(context).text.withOpacity(0.5) AppColors.of(context).text.withValues(alpha: 0.5)
: widget.backgroundColor ?? : widget.backgroundColor ??
AppColors.of(context).text.withOpacity(.15), AppColors.of(context).text.withValues(alpha: .15),
child: InkWell( child: InkWell(
onTap: widget.onTap, onTap: widget.onTap,
onDoubleTap: widget.onDoubleTap, onDoubleTap: widget.onDoubleTap,
@ -114,7 +114,7 @@ class _ProfileImageState extends State<ProfileImage> {
width: 15, width: 15,
height: 15, height: 15,
decoration: BoxDecoration( decoration: BoxDecoration(
color: color.withOpacity(.5), color: color.withValues(alpha: .5),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
) )
@ -206,7 +206,7 @@ class _ProfileImageState extends State<ProfileImage> {
color: profilePicture != null color: profilePicture != null
? Colors.transparent ? Colors.transparent
: widget.backgroundColor ?? : widget.backgroundColor ??
AppColors.of(context).text.withOpacity(.15), AppColors.of(context).text.withValues(alpha: .15),
child: AnimatedContainer( child: AnimatedContainer(
duration: const Duration(milliseconds: 200), duration: const Duration(milliseconds: 200),
height: widget.radius * 2, height: widget.radius * 2,

9
refilc_mobile_ui/lib/common/progress_bar.dart
View File

@ -2,7 +2,10 @@ import 'package:flutter/material.dart';
class ProgressBar extends StatelessWidget { class ProgressBar extends StatelessWidget {
const ProgressBar( const ProgressBar(
{super.key, required this.value, this.backgroundColor, this.height = 8.0}); {super.key,
required this.value,
this.backgroundColor,
this.height = 8.0});
final double value; final double value;
final Color? backgroundColor; final Color? backgroundColor;
@ -16,8 +19,8 @@ class ProgressBar extends StatelessWidget {
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).brightness == Brightness.light color: Theme.of(context).brightness == Brightness.light
? Colors.black.withOpacity(0.1) ? Colors.black.withValues(alpha: 0.1)
: Colors.white.withOpacity(0.1), : Colors.white.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(45.0), borderRadius: BorderRadius.circular(45.0),
), ),
width: double.infinity, width: double.infinity,

2
refilc_mobile_ui/lib/common/round_border_icon.dart
View File

@ -19,7 +19,7 @@ class RoundBorderIcon extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: color ?? color: color ??
Theme.of(context).colorScheme.secondary.withOpacity(0.25), Theme.of(context).colorScheme.secondary.withValues(alpha: 0.25),
width: width), width: width),
borderRadius: BorderRadius.circular(50.0), borderRadius: BorderRadius.circular(50.0),
), ),

4
refilc_mobile_ui/lib/common/splitted_panel/splitted_panel.dart
View File

@ -56,7 +56,7 @@ class SplittedPanel extends StatelessWidget {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.25), .withValues(alpha: .25),
width: 1.0) width: 1.0)
: null, : null,
), ),
@ -121,7 +121,7 @@ class SplittedPanelTitle extends StatelessWidget {
child: DefaultTextStyle( child: DefaultTextStyle(
style: Theme.of(context).textTheme.titleMedium!.copyWith( style: Theme.of(context).textTheme.titleMedium!.copyWith(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColors.of(context).text.withOpacity(0.65)), color: AppColors.of(context).text.withValues(alpha: 0.65)),
child: title, child: title,
), ),
); );

2
refilc_mobile_ui/lib/common/widgets/absence/absence_display.dart
View File

@ -15,7 +15,7 @@ class AbsenceDisplay extends StatelessWidget {
padding: const EdgeInsets.only(top: 5.0), padding: const EdgeInsets.only(top: 5.0),
// padding: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 6.0), // padding: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 6.0),
// decoration: BoxDecoration( // decoration: BoxDecoration(
// color: Theme.of(context).scaffoldBackgroundColor.withOpacity(.2), // color: Theme.of(context).scaffoldBackgroundColor.withValues(alpha: .2),
// borderRadius: BorderRadius.circular(12.0), // borderRadius: BorderRadius.circular(12.0),
// ), // ),
child: Row(children: [ child: Row(children: [

4
refilc_mobile_ui/lib/common/widgets/absence/absence_subject_tile.dart
View File

@ -81,7 +81,7 @@ class AbsenceSubjectTile extends StatelessWidget {
// fontFamily: "monospace", // fontFamily: "monospace",
color: color:
getColorByPercentage(percentage, context: context) getColorByPercentage(percentage, context: context)
.withOpacity(0.8), .withValues(alpha: 0.8),
fontSize: 16.0, fontSize: 16.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
@ -109,5 +109,5 @@ Color getColorByPercentage(double percentage, {required BuildContext context}) {
color = AppColors.of(context).yellow; color = AppColors.of(context).yellow;
} }
return color.withOpacity(.8); return color.withValues(alpha: .8);
} }

2
refilc_mobile_ui/lib/common/widgets/absence/absence_tile.dart
View File

@ -57,7 +57,7 @@ class AbsenceTile extends StatelessWidget {
width: 39, width: 39,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: !group ? color.withOpacity(.25) : null, color: !group ? color.withValues(alpha: .25) : null,
), ),
child: Center( child: Center(
child: Icon(justificationIcon(absence.state), color: color)), child: Icon(justificationIcon(absence.state), color: color)),

2
refilc_mobile_ui/lib/common/widgets/absence/absence_view.dart
View File

@ -51,7 +51,7 @@ class AbsenceView extends StatelessWidget {
height: 44.0, height: 44.0,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: color.withOpacity(.25), color: color.withValues(alpha: .25),
), ),
child: Center( child: Center(
child: Icon( child: Icon(

6
refilc_mobile_ui/lib/common/widgets/absence_group/absence_group_tile.dart
View File

@ -48,7 +48,7 @@ class AbsenceGroupTile extends StatelessWidget {
height: 39.0, height: 39.0,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: color.withOpacity(.25), color: color.withValues(alpha: .25),
), ),
child: Center( child: Center(
child: Icon(AbsenceTile.justificationIcon(state), child: Icon(AbsenceTile.justificationIcon(state),
@ -76,7 +76,9 @@ class AbsenceGroupTile extends StatelessWidget {
.format(context, weekday: true), .format(context, weekday: true),
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context).text.withOpacity(0.8)), color: AppColors.of(context)
.text
.withValues(alpha: 0.8)),
) )
: null, : null,
children: absences, children: absences,

2
refilc_mobile_ui/lib/common/widgets/ad/ad_tile.dart
View File

@ -32,7 +32,7 @@ class AdTile extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 14.5, fontSize: 14.5,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context).text.withOpacity(0.7), color: AppColors.of(context).text.withValues(alpha: 0.7),
), ),
), ),
], ],

2
refilc_mobile_ui/lib/common/widgets/card_handle.dart
View File

@ -17,7 +17,7 @@ class CardHandle extends StatelessWidget {
margin: const EdgeInsets.only(top: 12.0), margin: const EdgeInsets.only(top: 12.0),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(45.0), borderRadius: BorderRadius.circular(45.0),
color: AppColors.of(context).text.withOpacity(0.10), color: AppColors.of(context).text.withValues(alpha: 0.10),
), ),
), ),
if (child != null) child!, if (child != null) child!,

4
refilc_mobile_ui/lib/common/widgets/cretification/certification_card.dart
View File

@ -39,7 +39,7 @@ class CertificationCard extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12.0), borderRadius: BorderRadius.circular(12.0),
gradient: LinearGradient( gradient: LinearGradient(
colors: [color, color.withOpacity(.75)], colors: [color, color.withValues(alpha: .75)],
), ),
), ),
child: Material( child: Material(
@ -65,7 +65,7 @@ class CertificationCard extends StatelessWidget {
TextSpan( TextSpan(
text: " • ${grades.length}", text: " • ${grades.length}",
style: TextStyle( style: TextStyle(
color: textColor.withOpacity(.75), color: textColor.withValues(alpha: .75),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16.0, fontSize: 16.0,
), ),

4
refilc_mobile_ui/lib/common/widgets/cretification/certification_tile.dart
View File

@ -66,7 +66,7 @@ class CertificationTile extends StatelessWidget {
child: ListTile( child: ListTile(
tileColor: gradeColor( tileColor: gradeColor(
context: context, value: grade.value.value, nocolor: false) context: context, value: grade.value.value, nocolor: false)
.withOpacity(.1), .withValues(alpha: .1),
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
contentPadding: isSubjectView contentPadding: isSubjectView
? const EdgeInsets.only(left: 20.0, right: 12.0, bottom: 6.0) ? const EdgeInsets.only(left: 20.0, right: 12.0, bottom: 6.0)
@ -85,7 +85,7 @@ class CertificationTile extends StatelessWidget {
SubjectIcon.resolveVariant( SubjectIcon.resolveVariant(
subject: grade.subject, context: context), subject: grade.subject, context: context),
size: 28.0, size: 28.0,
color: AppColors.of(context).text.withOpacity(.75)), color: AppColors.of(context).text.withValues(alpha: .75)),
), ),
minLeadingWidth: isSubjectView ? 32.0 : 42.0, minLeadingWidth: isSubjectView ? 32.0 : 42.0,
trailing: isSubjectView trailing: isSubjectView

6
refilc_mobile_ui/lib/common/widgets/custom_segmented_control.dart
View File

@ -34,7 +34,7 @@ class CustomSegmentedControl extends StatelessWidget {
initialValue: value, initialValue: value,
children: finalChildren, children: finalChildren,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary.withOpacity(.069), color: Theme.of(context).colorScheme.secondary.withValues(alpha: .069),
borderRadius: BorderRadius.circular(12.0), borderRadius: BorderRadius.circular(12.0),
), ),
thumbDecoration: BoxDecoration( thumbDecoration: BoxDecoration(
@ -42,7 +42,7 @@ class CustomSegmentedControl extends StatelessWidget {
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(10.0),
// boxShadow: [ // boxShadow: [
// BoxShadow( // BoxShadow(
// color: Colors.black.withOpacity(.3), // color: Colors.black.withValues(alpha: .3),
// blurRadius: 4.0, // blurRadius: 4.0,
// spreadRadius: 1.0, // spreadRadius: 1.0,
// offset: const Offset( // offset: const Offset(
@ -66,7 +66,7 @@ class CustomSegmentedControl extends StatelessWidget {
// endIndent: 2, // endIndent: 2,
// thickness: 2, // thickness: 2,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(0.2), color: AppColors.of(context).text.withValues(alpha: 0.2),
), ),
), ),
height: height, height: height,

6
refilc_mobile_ui/lib/common/widgets/custom_switch.dart
View File

@ -28,7 +28,9 @@ class CustomSwitch extends StatelessWidget {
borderRadius: const BorderRadius.all( borderRadius: const BorderRadius.all(
Radius.circular(25.0), Radius.circular(25.0),
), ),
color: value ? Theme.of(context).colorScheme.secondary : Theme.of(context).highlightColor, color: value
? Theme.of(context).colorScheme.secondary
: Theme.of(context).highlightColor,
), ),
), ),
AnimatedAlign( AnimatedAlign(
@ -44,7 +46,7 @@ class CustomSwitch extends StatelessWidget {
color: Colors.white, color: Colors.white,
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black12.withOpacity(0.1), color: Colors.black12.withValues(alpha: 0.1),
spreadRadius: 0.5, spreadRadius: 0.5,
blurRadius: 1, blurRadius: 1,
) )

2
refilc_mobile_ui/lib/common/widgets/exam/exam_tile.dart
View File

@ -59,7 +59,7 @@ class ExamTile extends StatelessWidget {
? Icon( ? Icon(
SubjectIcon.resolveVariant( SubjectIcon.resolveVariant(
context: context, subject: exam.subject), context: context, subject: exam.subject),
color: AppColors.of(context).text.withOpacity(.5), color: AppColors.of(context).text.withValues(alpha: .5),
) )
: null, : null,
minLeadingWidth: 0, minLeadingWidth: 0,

2
refilc_mobile_ui/lib/common/widgets/exam/exam_view.dart
View File

@ -31,7 +31,7 @@ class ExamView extends StatelessWidget {
SubjectIcon.resolveVariant( SubjectIcon.resolveVariant(
subject: exam.subject, context: context), subject: exam.subject, context: context),
size: 36.0, size: 36.0,
color: AppColors.of(context).text.withOpacity(.75), color: AppColors.of(context).text.withValues(alpha: .75),
), ),
), ),
title: Text( title: Text(

23
refilc_mobile_ui/lib/common/widgets/exam/exam_viewable.dart
View File

@ -122,7 +122,7 @@ class ExamPopup extends StatelessWidget {
color: ColorsUtils() color: ColorsUtils()
.fade(context, Theme.of(context).colorScheme.secondary, .fade(context, Theme.of(context).colorScheme.secondary,
darkenAmount: 0.1, lightenAmount: 0.1) darkenAmount: 0.1, lightenAmount: 0.1)
.withOpacity(0.33), .withValues(alpha: 0.33),
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
), ),
Container( Container(
@ -135,10 +135,10 @@ class ExamPopup extends StatelessWidget {
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
Theme.of(context) Theme.of(context)
.scaffoldBackgroundColor .scaffoldBackgroundColor
.withOpacity(0.1), .withValues(alpha: 0.1),
Theme.of(context) Theme.of(context)
.scaffoldBackgroundColor .scaffoldBackgroundColor
.withOpacity(0.1), .withValues(alpha: 0.1),
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
], ],
stops: const [0.1, 0.5, 0.7, 1.0], stops: const [0.1, 0.5, 0.7, 1.0],
@ -166,7 +166,7 @@ class ExamPopup extends StatelessWidget {
.fade( .fade(
context, Theme.of(context).colorScheme.secondary, context, Theme.of(context).colorScheme.secondary,
darkenAmount: 0.1, lightenAmount: 0.1) darkenAmount: 0.1, lightenAmount: 0.1)
.withOpacity(0.33), .withValues(alpha: 0.33),
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
2.0, 2.0,
), ),
@ -186,7 +186,7 @@ class ExamPopup extends StatelessWidget {
Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary,
amount: 0.1, amount: 0.1,
) )
.withOpacity(0.9), .withValues(alpha: 0.9),
width: 1.5, width: 1.5,
padding: 10.0, padding: 10.0,
icon: Icon( icon: Icon(
@ -198,7 +198,7 @@ class ExamPopup extends StatelessWidget {
Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary,
amount: 0.1, amount: 0.1,
) )
.withOpacity(0.8), .withValues(alpha: 0.8),
), ),
), ),
), ),
@ -236,7 +236,7 @@ class ExamPopup extends StatelessWidget {
style: TextStyle( style: TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.9), .withValues(alpha: 0.9),
fontSize: 16.0, fontSize: 16.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
@ -298,7 +298,7 @@ class ExamPopup extends StatelessWidget {
style: TextStyle( style: TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.9), .withValues(alpha: 0.9),
fontSize: 16.0, fontSize: 16.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontStyle: ((lesson?.subject.isRenamed ?? fontStyle: ((lesson?.subject.isRenamed ??
@ -315,8 +315,9 @@ class ExamPopup extends StatelessWidget {
Text( Text(
'${DateFormat('MMM d, H:mm', I18n.locale.countryCode).format(lesson!.start).capital()} - ${DateFormat('H:mm').format(lesson!.end)}', '${DateFormat('MMM d, H:mm', I18n.locale.countryCode).format(lesson!.start).capital()} - ${DateFormat('H:mm').format(lesson!.end)}',
style: TextStyle( style: TextStyle(
color: color: AppColors.of(context)
AppColors.of(context).text.withOpacity(0.85), .text
.withValues(alpha: 0.85),
fontSize: 14.0, fontSize: 14.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
@ -359,7 +360,7 @@ class ExamPopup extends StatelessWidget {
// 'view_subject'.i18n, // 'view_subject'.i18n,
// style: TextStyle( // style: TextStyle(
// color: // color:
// AppColors.of(context).text.withOpacity(0.9), // AppColors.of(context).text.withValues(alpha: 0.9),
// fontSize: 18.0, // fontSize: 18.0,
// fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
// ), // ),

23
refilc_mobile_ui/lib/common/widgets/grade/new_grades.dart
View File

@ -42,8 +42,10 @@ class NewGradesSurprise extends StatelessWidget {
child: Container( child: Container(
decoration: BoxDecoration(boxShadow: [ decoration: BoxDecoration(boxShadow: [
BoxShadow( BoxShadow(
color: color: Theme.of(context)
Theme.of(context).colorScheme.secondary.withOpacity(.5), .colorScheme
.secondary
.withValues(alpha: .5),
blurRadius: 18.0, blurRadius: 18.0,
) )
]), ]),
@ -59,7 +61,8 @@ class NewGradesSurprise extends StatelessWidget {
width: 85, width: 85,
height: 15, height: 15,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.85), color:
AppColors.of(context).text.withValues(alpha: .85),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
), ),
@ -78,7 +81,8 @@ class NewGradesSurprise extends StatelessWidget {
width: 125, width: 125,
height: 10, height: 10,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.45), color:
AppColors.of(context).text.withValues(alpha: .45),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
), ),
@ -97,7 +101,8 @@ class NewGradesSurprise extends StatelessWidget {
width: 25, width: 25,
height: 25, height: 25,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.45), color:
AppColors.of(context).text.withValues(alpha: .45),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
), ),
), ),
@ -110,7 +115,9 @@ class NewGradesSurprise extends StatelessWidget {
style: TextStyle( style: TextStyle(
shadows: [ shadows: [
Shadow( Shadow(
color: AppColors.of(context).text.withOpacity(.2), color: AppColors.of(context)
.text
.withValues(alpha: .2),
offset: const Offset(2, 2), offset: const Offset(2, 2),
) )
], ],
@ -119,7 +126,7 @@ class NewGradesSurprise extends StatelessWidget {
text: "x", text: "x",
style: TextStyle( style: TextStyle(
fontSize: 20.0, fontSize: 20.0,
color: AppColors.of(context).text.withOpacity(.5), color: AppColors.of(context).text.withValues(alpha: .5),
fontWeight: FontWeight.w800, fontWeight: FontWeight.w800,
), ),
) )
@ -127,7 +134,7 @@ class NewGradesSurprise extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 28.0, fontSize: 28.0,
color: AppColors.of(context).text.withOpacity(.75), color: AppColors.of(context).text.withValues(alpha: .75),
), ),
), ),
), ),

24
refilc_mobile_ui/lib/common/widgets/grade/surprise_grade.dart
View File

@ -134,9 +134,12 @@ class _SurpriseGradeState extends State<SurpriseGrade>
return FadeTransition( return FadeTransition(
opacity: _revealAnimFade, opacity: _revealAnimFade,
child: Material( child: Material(
color: Colors.black.withOpacity(.75), color: Colors.black.withValues(alpha: .75),
child: Container( child: Container(
color: Theme.of(context).colorScheme.secondary.withOpacity(.05), color: Theme.of(context)
.colorScheme
.secondary
.withValues(alpha: .05),
child: Container( child: Container(
decoration: const BoxDecoration( decoration: const BoxDecoration(
gradient: RadialGradient( gradient: RadialGradient(
@ -223,12 +226,13 @@ class _SurpriseGradeState extends State<SurpriseGrade>
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 32.0, vertical: 20.0), horizontal: 32.0, vertical: 20.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white.withOpacity(.3), color: Colors.white
.withValues(alpha: .3),
borderRadius: borderRadius:
BorderRadius.circular(24.0), BorderRadius.circular(24.0),
border: Border.all( border: Border.all(
color: Colors.black color: Colors.black
.withOpacity(.3), .withValues(alpha: .3),
width: 1.0), width: 1.0),
), ),
child: Row( child: Row(
@ -264,7 +268,8 @@ class _SurpriseGradeState extends State<SurpriseGrade>
.capital(), .capital(),
style: TextStyle( style: TextStyle(
color: Colors.white color: Colors.white
.withOpacity(.8), .withValues(
alpha: .8),
fontWeight: fontWeight:
FontWeight.bold, FontWeight.bold,
fontSize: 24.0, fontSize: 24.0,
@ -285,7 +290,8 @@ class _SurpriseGradeState extends State<SurpriseGrade>
"${widget.grade.value.weight}%", "${widget.grade.value.weight}%",
style: TextStyle( style: TextStyle(
color: Colors.white color: Colors.white
.withOpacity(.7), .withValues(
alpha: .7),
fontWeight: fontWeight:
FontWeight.w600, FontWeight.w600,
fontSize: 20.0, fontSize: 20.0,
@ -326,7 +332,7 @@ class _SurpriseGradeState extends State<SurpriseGrade>
child: Text( child: Text(
"open_subtitle".i18n, "open_subtitle".i18n,
style: TextStyle( style: TextStyle(
color: Colors.white.withOpacity(.8), color: Colors.white.withValues(alpha: .8),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 24.0, fontSize: 24.0,
), ),
@ -383,7 +389,7 @@ class _SurpriseGradeState extends State<SurpriseGrade>
context: context, context: context,
value: value:
widget.grade.value.value) widget.grade.value.value)
.withOpacity(.5), .withValues(alpha: .5),
blurRadius: 24.0, blurRadius: 24.0,
), ),
Shadow( Shadow(
@ -391,7 +397,7 @@ class _SurpriseGradeState extends State<SurpriseGrade>
context: context, context: context,
value: value:
widget.grade.value.value) widget.grade.value.value)
.withOpacity(.3), .withValues(alpha: .3),
offset: const Offset(-3, -3), offset: const Offset(-3, -3),
), ),
], ],

12
refilc_mobile_ui/lib/common/widgets/homework/homework_tile.dart
View File

@ -38,7 +38,7 @@ class HomeworkTile extends StatelessWidget {
child: censored child: censored
? Container( ? Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.55), color: AppColors.of(context).text.withValues(alpha: .55),
borderRadius: BorderRadius.circular(60.0), borderRadius: BorderRadius.circular(60.0),
), ),
) )
@ -48,7 +48,7 @@ class HomeworkTile extends StatelessWidget {
SubjectIcon.resolveVariant( SubjectIcon.resolveVariant(
subject: homework.subject, context: context), subject: homework.subject, context: context),
size: 28.0, size: 28.0,
color: AppColors.of(context).text.withOpacity(.75), color: AppColors.of(context).text.withValues(alpha: .75),
), ),
), ),
), ),
@ -59,7 +59,7 @@ class HomeworkTile extends StatelessWidget {
width: 160, width: 160,
height: 15, height: 15,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.85), color: AppColors.of(context).text.withValues(alpha: .85),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
), ),
@ -83,7 +83,7 @@ class HomeworkTile extends StatelessWidget {
width: 100, width: 100,
height: 10, height: 10,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.45), color: AppColors.of(context).text.withValues(alpha: .45),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
), ),
@ -100,13 +100,13 @@ class HomeworkTile extends StatelessWidget {
width: 15, width: 15,
height: 15, height: 15,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).text.withOpacity(.45), color: AppColors.of(context).text.withValues(alpha: .45),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
) )
: Icon( : Icon(
FeatherIcons.home, FeatherIcons.home,
color: AppColors.of(context).text.withOpacity(.75), color: AppColors.of(context).text.withValues(alpha: .75),
), ),
minLeadingWidth: 0, minLeadingWidth: 0,
), ),

37
refilc_mobile_ui/lib/common/widgets/lesson/lesson_viewable.dart
View File

@ -320,7 +320,7 @@ class TimetableLessonPopup extends StatelessWidget {
color: ColorsUtils() color: ColorsUtils()
.fade(context, Theme.of(context).colorScheme.secondary, .fade(context, Theme.of(context).colorScheme.secondary,
darkenAmount: 0.1, lightenAmount: 0.1) darkenAmount: 0.1, lightenAmount: 0.1)
.withOpacity(0.33), .withValues(alpha: 0.33),
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
), ),
Container( Container(
@ -333,10 +333,10 @@ class TimetableLessonPopup extends StatelessWidget {
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
Theme.of(context) Theme.of(context)
.scaffoldBackgroundColor .scaffoldBackgroundColor
.withOpacity(0.1), .withValues(alpha: 0.1),
Theme.of(context) Theme.of(context)
.scaffoldBackgroundColor .scaffoldBackgroundColor
.withOpacity(0.1), .withValues(alpha: 0.1),
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
], ],
stops: const [0.0, 0.3, 0.6, 0.95], stops: const [0.0, 0.3, 0.6, 0.95],
@ -373,7 +373,7 @@ class TimetableLessonPopup extends StatelessWidget {
.fade(context, .fade(context,
Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary,
darkenAmount: 0.1, lightenAmount: 0.1) darkenAmount: 0.1, lightenAmount: 0.1)
.withOpacity(0.33), .withValues(alpha: 0.33),
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
2.0, 2.0,
), ),
@ -395,7 +395,7 @@ class TimetableLessonPopup extends StatelessWidget {
Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary,
amount: 0.1, amount: 0.1,
) )
.withOpacity(0.9), .withValues(alpha: 0.9),
width: 1.5, width: 1.5,
padding: 10.0, padding: 10.0,
icon: Icon( icon: Icon(
@ -407,7 +407,7 @@ class TimetableLessonPopup extends StatelessWidget {
Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary,
amount: 0.1, amount: 0.1,
) )
.withOpacity(0.8), .withValues(alpha: 0.8),
), ),
), ),
), ),
@ -434,7 +434,7 @@ class TimetableLessonPopup extends StatelessWidget {
style: TextStyle( style: TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.85), .withValues(alpha: 0.85),
fontSize: 14.0, fontSize: 14.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
@ -450,7 +450,7 @@ class TimetableLessonPopup extends StatelessWidget {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.tertiary .tertiary
.withOpacity(.15), .withValues(alpha: .15),
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(10.0),
), ),
child: Text( child: Text(
@ -463,7 +463,7 @@ class TimetableLessonPopup extends StatelessWidget {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.9), .withValues(alpha: .9),
), ),
), ),
), ),
@ -505,7 +505,9 @@ class TimetableLessonPopup extends StatelessWidget {
: lesson.substituteTeacher!.name)) ?? : lesson.substituteTeacher!.name)) ??
'', '',
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(0.9), color: AppColors.of(context)
.text
.withValues(alpha: 0.9),
fontSize: 14.0, fontSize: 14.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
@ -534,8 +536,9 @@ class TimetableLessonPopup extends StatelessWidget {
Text( Text(
lesson.description, lesson.description,
style: TextStyle( style: TextStyle(
color: color: AppColors.of(context)
AppColors.of(context).text.withOpacity(0.9), .text
.withValues(alpha: 0.9),
fontSize: 14.0, fontSize: 14.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
@ -564,7 +567,9 @@ class TimetableLessonPopup extends StatelessWidget {
Text( Text(
'${'year_index'.i18n}: ${lesson.lessonYearIndex ?? '?'}', '${'year_index'.i18n}: ${lesson.lessonYearIndex ?? '?'}',
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(0.9), color: AppColors.of(context)
.text
.withValues(alpha: 0.9),
fontSize: 14.0, fontSize: 14.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
@ -607,7 +612,7 @@ class TimetableLessonPopup extends StatelessWidget {
style: TextStyle( style: TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.9), .withValues(alpha: 0.9),
fontSize: 16.0, fontSize: 16.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
@ -622,7 +627,7 @@ class TimetableLessonPopup extends StatelessWidget {
style: TextStyle( style: TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.85), .withValues(alpha: 0.85),
fontSize: 14.0, fontSize: 14.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
@ -665,7 +670,7 @@ class TimetableLessonPopup extends StatelessWidget {
// 'view_subject'.i18n, // 'view_subject'.i18n,
// style: TextStyle( // style: TextStyle(
// color: // color:
// AppColors.of(context).text.withOpacity(0.9), // AppColors.of(context).text.withValues(alpha: 0.9),
// fontSize: 18.0, // fontSize: 18.0,
// fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
// ), // ),

7
refilc_mobile_ui/lib/common/widgets/message/message_view_tile.dart
View File

@ -91,7 +91,10 @@ class MessageViewTile extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16.0), borderRadius: BorderRadius.circular(16.0),
border: Border.all( border: Border.all(
color: Theme.of(context).colorScheme.secondary.withOpacity(.25), color: Theme.of(context)
.colorScheme
.secondary
.withValues(alpha: .25),
width: 1.0, width: 1.0,
), ),
), ),
@ -122,7 +125,7 @@ class MessageViewTile extends StatelessWidget {
.textTheme .textTheme
.bodySmall .bodySmall
?.color ?.color
?.withOpacity(0.6), ?.withValues(alpha: 0.6),
), ),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 1, maxLines: 1,

2
refilc_mobile_ui/lib/common/widgets/missed_exam/missed_exam_tile.dart
View File

@ -23,7 +23,7 @@ class MissedExamTile extends StatelessWidget {
height: 36, height: 36,
child: Icon( child: Icon(
FeatherIcons.slash, FeatherIcons.slash,
color: AppColors.of(context).red.withOpacity(.75), color: AppColors.of(context).red.withValues(alpha: .75),
size: 28.0, size: 28.0,
)), )),
title: Text("missed_exams" title: Text("missed_exams"

2
refilc_mobile_ui/lib/common/widgets/missed_exam/missed_exam_view.dart
View File

@ -50,7 +50,7 @@ class MissedExamViewTile extends StatelessWidget {
leading: Icon( leading: Icon(
SubjectIcon.resolveVariant( SubjectIcon.resolveVariant(
subject: lesson.subject, context: context), subject: lesson.subject, context: context),
color: AppColors.of(context).text.withOpacity(.8), color: AppColors.of(context).text.withValues(alpha: .8),
size: 32.0, size: 32.0,
), ),
title: Text( title: Text(

4
refilc_mobile_ui/lib/common/widgets/statistics_tile.dart
View File

@ -81,13 +81,13 @@ class StatisticsTile extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
color: fill color: fill
? (color ?? gradeColor(context: context, value: value)) ? (color ?? gradeColor(context: context, value: value))
.withOpacity(.2) .withValues(alpha: .2)
: null, : null,
border: outline || fill border: outline || fill
? Border.all( ? Border.all(
color: color:
(color ?? gradeColor(context: context, value: value)) (color ?? gradeColor(context: context, value: value))
.withOpacity(outline ? 1.0 : 0.0), .withValues(alpha: outline ? 1.0 : 0.0),
width: fill ? 5.0 : 5.0, width: fill ? 5.0 : 5.0,
) )
: null, : null,

4
refilc_mobile_ui/lib/common/widgets/tick_tile.dart
View File

@ -81,7 +81,7 @@ class TickTileState extends State<TickTile> {
fontSize: 15.5, fontSize: 15.5,
decoration: isTicked ? TextDecoration.lineThrough : null, decoration: isTicked ? TextDecoration.lineThrough : null,
color: isTicked color: isTicked
? AppColors.of(context).text.withOpacity(0.5) ? AppColors.of(context).text.withValues(alpha: 0.5)
: null, : null,
), ),
), ),
@ -97,7 +97,7 @@ class TickTileState extends State<TickTile> {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 12.0, fontSize: 12.0,
color: isTicked color: isTicked
? AppColors.of(context).text.withOpacity(0.5) ? AppColors.of(context).text.withValues(alpha: 0.5)
: null, : null,
), ),
) )

3
refilc_mobile_ui/lib/common/widgets/update/updates_view.dart
View File

@ -54,7 +54,8 @@ class UpdateViewState extends State<UpdateView> {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16.0, fontSize: 16.0,
color: AppColors.of(context).text.withOpacity(0.6), color:
AppColors.of(context).text.withValues(alpha: 0.6),
), ),
), ),
], ],

2
refilc_mobile_ui/lib/pages/absences/absences_page.dart
View File

@ -643,7 +643,7 @@ class AbsencesPageState extends State<AbsencesPage>
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.8), .withValues(alpha: 0.8),
), ),
), ),
], ],

2
refilc_mobile_ui/lib/pages/grades/average_selector.dart
View File

@ -98,7 +98,7 @@ class AverageSelectorState extends State<AverageSelector> {
avgDropItems[widget.value]!.i18n, avgDropItems[widget.value]!.i18n,
style: Theme.of(context).textTheme.titleSmall!.copyWith( style: Theme.of(context).textTheme.titleSmall!.copyWith(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColors.of(context).text.withOpacity(0.65)), color: AppColors.of(context).text.withValues(alpha: 0.65)),
), ),
const SizedBox( const SizedBox(
width: 4, width: 4,

2
refilc_mobile_ui/lib/pages/grades/fail_warning.dart
View File

@ -27,7 +27,7 @@ class FailWarning extends StatelessWidget {
children: [ children: [
Icon( Icon(
FeatherIcons.alertTriangle, FeatherIcons.alertTriangle,
color: Colors.orange.withOpacity(.5), color: Colors.orange.withValues(alpha: .5),
size: 20.0, size: 20.0,
), ),
const SizedBox(width: 12.0), const SizedBox(width: 12.0),

2
refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart
View File

@ -493,7 +493,7 @@ class _GradeSubjectViewState extends State<GradeSubjectView>
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.primary .primary
.withOpacity(.15), .withValues(alpha: .15),
), ),
child: Icon( child: Icon(
FeatherIcons.flag, FeatherIcons.flag,

28
refilc_mobile_ui/lib/pages/grades/graph.dart
View File

@ -171,7 +171,7 @@ class GradeGraphState extends State<GradeGraph> {
VerticalLine( VerticalLine(
x: x, x: x,
strokeWidth: 3.0, strokeWidth: 3.0,
color: AppColors.of(context).red.withOpacity(.75), color: AppColors.of(context).red.withValues(alpha: .75),
label: VerticalLineLabel( label: VerticalLineLabel(
labelResolver: (_) => " ${"mid".i18n} ​", // <- zwsp for padding labelResolver: (_) => " ${"mid".i18n} ​", // <- zwsp for padding
show: true, show: true,
@ -196,7 +196,7 @@ class GradeGraphState extends State<GradeGraph> {
settings.graphClassAvg) { settings.graphClassAvg) {
extraLinesH.add(HorizontalLine( extraLinesH.add(HorizontalLine(
y: widget.classAvg!, y: widget.classAvg!,
color: AppColors.of(context).text.withOpacity(.75), color: AppColors.of(context).text.withValues(alpha: .75),
)); ));
} }
@ -244,10 +244,10 @@ class GradeGraphState extends State<GradeGraph> {
begin: Alignment.topCenter, begin: Alignment.topCenter,
end: Alignment.bottomCenter, end: Alignment.bottomCenter,
colors: [ colors: [
averageColor.withOpacity(0.7), averageColor.withValues(alpha: 0.7),
averageColor.withOpacity(0.3), averageColor.withValues(alpha: 0.3),
averageColor.withOpacity(0.2), averageColor.withValues(alpha: 0.2),
averageColor.withOpacity(0.1), averageColor.withValues(alpha: 0.1),
], ],
stops: const [0.1, 0.6, 0.8, 1], stops: const [0.1, 0.6, 0.8, 1],
), ),
@ -274,16 +274,16 @@ class GradeGraphState extends State<GradeGraph> {
colors: [ colors: [
AppColors.of(context) AppColors.of(context)
.text .text
.withOpacity(0.7), .withValues(alpha: 0.7),
AppColors.of(context) AppColors.of(context)
.text .text
.withOpacity(0.3), .withValues(alpha: 0.3),
AppColors.of(context) AppColors.of(context)
.text .text
.withOpacity(0.2), .withValues(alpha: 0.2),
AppColors.of(context) AppColors.of(context)
.text .text
.withOpacity(0.1), .withValues(alpha: 0.1),
], ],
stops: const [0.1, 0.6, 0.8, 1], stops: const [0.1, 0.6, 0.8, 1],
), ),
@ -300,11 +300,11 @@ class GradeGraphState extends State<GradeGraph> {
horizontalInterval: 1, horizontalInterval: 1,
// checkToShowVerticalLine: (_) => false, // checkToShowVerticalLine: (_) => false,
// getDrawingHorizontalLine: (_) => FlLine( // getDrawingHorizontalLine: (_) => FlLine(
// color: AppColors.of(context).text.withOpacity(.15), // color: AppColors.of(context).text.withValues(alpha: .15),
// strokeWidth: 2, // strokeWidth: 2,
// ), // ),
// getDrawingVerticalLine: (_) => FlLine( // getDrawingVerticalLine: (_) => FlLine(
// color: AppColors.of(context).text.withOpacity(.25), // color: AppColors.of(context).text.withValues(alpha: .25),
// strokeWidth: 2, // strokeWidth: 2,
// ), // ),
), ),
@ -367,7 +367,7 @@ class GradeGraphState extends State<GradeGraph> {
style: TextStyle( style: TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(.75), .withValues(alpha: .75),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14.0, fontSize: 14.0,
), ),
@ -376,7 +376,7 @@ class GradeGraphState extends State<GradeGraph> {
// getTextStyles: (context, value) => TextStyle( // getTextStyles: (context, value) => TextStyle(
// color: AppColors.of(context) // color: AppColors.of(context)
// .text // .text
// .withOpacity(.75), // .withValues(alpha: .75),
// fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
// fontSize: 14.0, // fontSize: 14.0,
// ), // ),

37
refilc_mobile_ui/lib/pages/home/live_card/live_card.dart
View File

@ -114,7 +114,7 @@ class LiveCardStateA extends State<LiveCard> {
// context, // context,
// useRootNavigator: true, // useRootNavigator: true,
// builder: (context) => SlidingSheetDialog( // builder: (context) => SlidingSheetDialog(
// color: Colors.black.withOpacity(0.99), // color: Colors.black.withValues(alpha: 0.99),
// duration: const Duration(milliseconds: 400), // duration: const Duration(milliseconds: 400),
// scrollSpec: const ScrollSpec.bouncingScroll(), // scrollSpec: const ScrollSpec.bouncingScroll(),
// snapSpec: const SnapSpec( // snapSpec: const SnapSpec(
@ -162,7 +162,7 @@ class LiveCardStateA extends State<LiveCard> {
// color: Theme.of(context) // color: Theme.of(context)
// .colorScheme // .colorScheme
// .secondary // .secondary
// .withOpacity(.85), // .withValues(alpha: .85),
// fontStyle: liveCard.nextLesson!.subject.isRenamed && // fontStyle: liveCard.nextLesson!.subject.isRenamed &&
// settingsProvider.renamedSubjectsItalics // settingsProvider.renamedSubjectsItalics
// ? FontStyle.italic // ? FontStyle.italic
@ -176,7 +176,7 @@ class LiveCardStateA extends State<LiveCard> {
// color: Theme.of(context) // color: Theme.of(context)
// .colorScheme // .colorScheme
// .secondary // .secondary
// .withOpacity(.85), // .withValues(alpha: .85),
// ), // ),
// ), // ),
// TextSpan(text: "first_lesson_3".i18n), // TextSpan(text: "first_lesson_3".i18n),
@ -188,7 +188,7 @@ class LiveCardStateA extends State<LiveCard> {
// color: Theme.of(context) // color: Theme.of(context)
// .colorScheme // .colorScheme
// .secondary // .secondary
// .withOpacity(.85), // .withValues(alpha: .85),
// ), // ),
// ), // ),
// TextSpan(text: "first_lesson_4".i18n), // TextSpan(text: "first_lesson_4".i18n),
@ -281,7 +281,7 @@ class LiveCardStateA extends State<LiveCard> {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.15), .withValues(alpha: .15),
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(10.0),
), ),
child: Text( child: Text(
@ -294,7 +294,7 @@ class LiveCardStateA extends State<LiveCard> {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.9), .withValues(alpha: .9),
), ),
), ),
), ),
@ -469,7 +469,7 @@ class LiveCardStateA extends State<LiveCard> {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(.75), .withValues(alpha: .75),
height: 1.1, height: 1.1,
), ),
), ),
@ -547,7 +547,7 @@ class LiveCardStateA extends State<LiveCard> {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.tertiary .tertiary
.withOpacity(.15), .withValues(alpha: .15),
borderRadius: borderRadius:
BorderRadius.circular(10.0), BorderRadius.circular(10.0),
), ),
@ -561,7 +561,7 @@ class LiveCardStateA extends State<LiveCard> {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.9), .withValues(alpha: .9),
), ),
), ),
), ),
@ -730,10 +730,11 @@ class LiveCardStateA extends State<LiveCard> {
fontSize: 16.5, fontSize: 16.5,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(!liveCard .withValues(
.nextLesson!.isEmpty alpha: !liveCard
? 1.0 .nextLesson!.isEmpty
: 0.5), ? 1.0
: 0.5),
fontStyle: liveCard.nextLesson! fontStyle: liveCard.nextLesson!
.subject.isRenamed && .subject.isRenamed &&
settingsProvider settingsProvider
@ -752,7 +753,7 @@ class LiveCardStateA extends State<LiveCard> {
height: 1.0, height: 1.0,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(.75), .withValues(alpha: .75),
), ),
maxLines: !(nextSubject == null && maxLines: !(nextSubject == null &&
progressCurrent == null && progressCurrent == null &&
@ -830,7 +831,7 @@ class LiveCardStateA extends State<LiveCard> {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(.9), .withValues(alpha: .9),
), ),
), ),
], ],
@ -899,7 +900,7 @@ class LiveCardStateA extends State<LiveCard> {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(.75), .withValues(alpha: .75),
height: 1.1, height: 1.1,
), ),
), ),
@ -977,7 +978,7 @@ class LiveCardStateA extends State<LiveCard> {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.tertiary .tertiary
.withOpacity(.15), .withValues(alpha: .15),
borderRadius: borderRadius:
BorderRadius.circular(10.0), BorderRadius.circular(10.0),
), ),
@ -991,7 +992,7 @@ class LiveCardStateA extends State<LiveCard> {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.9), .withValues(alpha: .9),
), ),
), ),
), ),

21
refilc_mobile_ui/lib/pages/home/live_card/live_card_widget.dart
View File

@ -132,7 +132,7 @@ class _LiveCardWidgetState extends State<LiveCardWidget> {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(0.5), .withValues(alpha: 0.5),
borderRadius: const BorderRadius.all( borderRadius: const BorderRadius.all(
Radius.circular(10), Radius.circular(10),
), ),
@ -220,8 +220,9 @@ class _LiveCardWidgetState extends State<LiveCardWidget> {
context) context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity( .withValues(
.3), alpha:
.3),
borderRadius: borderRadius:
BorderRadius BorderRadius
.circular( .circular(
@ -267,7 +268,7 @@ class _LiveCardWidgetState extends State<LiveCardWidget> {
size: 26.0, size: 26.0,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(.75), .withValues(alpha: .75),
), ),
), ),
], ],
@ -283,7 +284,7 @@ class _LiveCardWidgetState extends State<LiveCardWidget> {
height: 1.0, height: 1.0,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(.75), .withValues(alpha: .75),
), ),
maxLines: maxLines:
!(widget.nextSubject == null && !(widget.nextSubject == null &&
@ -341,7 +342,8 @@ class _LiveCardWidgetState extends State<LiveCardWidget> {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.25), .withValues(
alpha: .25),
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius.circular(
4.0), 4.0),
@ -356,7 +358,8 @@ class _LiveCardWidgetState extends State<LiveCardWidget> {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.9), .withValues(
alpha: .9),
), ),
), ),
), ),
@ -366,7 +369,7 @@ class _LiveCardWidgetState extends State<LiveCardWidget> {
style: TextStyle( style: TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(.8), .withValues(alpha: .8),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
maxLines: 1, maxLines: 1,
@ -393,7 +396,7 @@ class _LiveCardWidgetState extends State<LiveCardWidget> {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(.75), .withValues(alpha: .75),
), ),
), ),
), ),

25
refilc_mobile_ui/lib/pages/home/live_card/segmented_countdown.dart
View File

@ -24,7 +24,8 @@ class SegmentedCountdownState extends State<SegmentedCountdown> {
children: [ children: [
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.05), color:
Theme.of(context).colorScheme.secondary.withValues(alpha: 0.05),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
padding: const EdgeInsets.symmetric(vertical: 2.0), padding: const EdgeInsets.symmetric(vertical: 2.0),
@ -46,7 +47,7 @@ class SegmentedCountdownState extends State<SegmentedCountdown> {
style: TextStyle( style: TextStyle(
fontSize: 16.0, fontSize: 16.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context).text.withOpacity(0.6), color: AppColors.of(context).text.withValues(alpha: 0.6),
), ),
), ),
const SizedBox( const SizedBox(
@ -54,7 +55,8 @@ class SegmentedCountdownState extends State<SegmentedCountdown> {
), ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.05), color:
Theme.of(context).colorScheme.secondary.withValues(alpha: 0.05),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
padding: const EdgeInsets.symmetric(vertical: 2.0), padding: const EdgeInsets.symmetric(vertical: 2.0),
@ -71,7 +73,10 @@ class SegmentedCountdownState extends State<SegmentedCountdown> {
if (diffMins.length == 2) if (diffMins.length == 2)
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.05), color: Theme.of(context)
.colorScheme
.secondary
.withValues(alpha: 0.05),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
padding: const EdgeInsets.symmetric(vertical: 2.0), padding: const EdgeInsets.symmetric(vertical: 2.0),
@ -94,7 +99,7 @@ class SegmentedCountdownState extends State<SegmentedCountdown> {
style: TextStyle( style: TextStyle(
fontSize: 16.0, fontSize: 16.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context).text.withOpacity(0.6), color: AppColors.of(context).text.withValues(alpha: 0.6),
), ),
), ),
const SizedBox( const SizedBox(
@ -102,7 +107,8 @@ class SegmentedCountdownState extends State<SegmentedCountdown> {
), ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.05), color:
Theme.of(context).colorScheme.secondary.withValues(alpha: 0.05),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
padding: const EdgeInsets.symmetric(vertical: 2.0), padding: const EdgeInsets.symmetric(vertical: 2.0),
@ -119,7 +125,10 @@ class SegmentedCountdownState extends State<SegmentedCountdown> {
if (diffSecs.length == 2) if (diffSecs.length == 2)
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.05), color: Theme.of(context)
.colorScheme
.secondary
.withValues(alpha: 0.05),
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
padding: const EdgeInsets.symmetric(vertical: 2.0), padding: const EdgeInsets.symmetric(vertical: 2.0),
@ -142,7 +151,7 @@ class SegmentedCountdownState extends State<SegmentedCountdown> {
style: TextStyle( style: TextStyle(
fontSize: 16.0, fontSize: 16.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context).text.withOpacity(0.6), color: AppColors.of(context).text.withValues(alpha: 0.6),
), ),
), ),
], ],

88
refilc_mobile_ui/lib/pages/home/particle.dart
View File

@ -36,7 +36,8 @@ class FourRandomSlotParticle extends Particle {
final double relativeDistanceToMiddle; final double relativeDistanceToMiddle;
FourRandomSlotParticle({required this.children, this.relativeDistanceToMiddle = 2.0}); FourRandomSlotParticle(
{required this.children, this.relativeDistanceToMiddle = 2.0});
@override @override
void paint(Canvas canvas, Size size, double progress, int seed) { void paint(Canvas canvas, Size size, double progress, int seed) {
@ -53,13 +54,17 @@ class FourRandomSlotParticle extends Particle {
Offset sideToOffset(int side, Size size, Random random) { Offset sideToOffset(int side, Size size, Random random) {
if (side == 0) { if (side == 0) {
return Offset(-random.nextDouble() * (size.width / 2), -random.nextDouble() * (size.height / 2)); return Offset(-random.nextDouble() * (size.width / 2),
-random.nextDouble() * (size.height / 2));
} else if (side == 1) { } else if (side == 1) {
return Offset(random.nextDouble() * (size.width / 2), -random.nextDouble() * (size.height / 2)); return Offset(random.nextDouble() * (size.width / 2),
-random.nextDouble() * (size.height / 2));
} else if (side == 2) { } else if (side == 2) {
return Offset(random.nextDouble() * (size.width / 2), random.nextDouble() * (size.height / 2)); return Offset(random.nextDouble() * (size.width / 2),
random.nextDouble() * (size.height / 2));
} else if (side == 3) { } else if (side == 3) {
return Offset(-random.nextDouble() * (size.width / 2), random.nextDouble() * (size.height / 2)); return Offset(-random.nextDouble() * (size.width / 2),
random.nextDouble() * (size.height / 2));
} else { } else {
throw Exception(); throw Exception();
} }
@ -148,9 +153,16 @@ class CircleMirror extends Particle {
final int numberOfParticles; final int numberOfParticles;
CircleMirror.builder({required this.particleBuilder, required this.initialRotation, required this.numberOfParticles}); CircleMirror.builder(
{required this.particleBuilder,
required this.initialRotation,
required this.numberOfParticles});
CircleMirror({required Particle child, required this.initialRotation, required this.numberOfParticles}) : particleBuilder = ((index) => child); CircleMirror(
{required Particle child,
required this.initialRotation,
required this.numberOfParticles})
: particleBuilder = ((index) => child);
@override @override
void paint(Canvas canvas, Size size, double progress, seed) { void paint(Canvas canvas, Size size, double progress, seed) {
@ -177,9 +189,15 @@ class RectangleMirror extends Particle {
final int numberOfParticles; final int numberOfParticles;
RectangleMirror.builder({required this.particleBuilder, required this.initialDistance, required this.numberOfParticles}); RectangleMirror.builder(
{required this.particleBuilder,
required this.initialDistance,
required this.numberOfParticles});
RectangleMirror({required Particle child, required this.initialDistance, required this.numberOfParticles}) RectangleMirror(
{required Particle child,
required this.initialDistance,
required this.numberOfParticles})
: particleBuilder = ((index) => child); : particleBuilder = ((index) => child);
@override @override
@ -191,14 +209,17 @@ class RectangleMirror extends Particle {
bool onHorizontalAxis = true; bool onHorizontalAxis = true;
int side = 0; int side = 0;
assert((distanceBetweenParticles * numberOfParticles).round() == totalLength.round()); assert((distanceBetweenParticles * numberOfParticles).round() ==
totalLength.round());
canvas.translate(-size.width / 2, -size.height / 2); canvas.translate(-size.width / 2, -size.height / 2);
double currentDistance = initialDistance; double currentDistance = initialDistance;
for (int i = 0; i < numberOfParticles; i++) { for (int i = 0; i < numberOfParticles; i++) {
while (true) { while (true) {
if (onHorizontalAxis ? currentDistance > size.width : currentDistance > size.height) { if (onHorizontalAxis
? currentDistance > size.width
: currentDistance > size.height) {
currentDistance -= onHorizontalAxis ? size.width : size.height; currentDistance -= onHorizontalAxis ? size.width : size.height;
onHorizontalAxis = !onHorizontalAxis; onHorizontalAxis = !onHorizontalAxis;
side = (++side) % 4; side = (++side) % 4;
@ -215,7 +236,8 @@ class RectangleMirror extends Particle {
}); });
} else if (side == 2) { } else if (side == 2) {
assert(onHorizontalAxis); assert(onHorizontalAxis);
moveTo(canvas, size, 2, size.width - currentDistance, size.height, () { moveTo(canvas, size, 2, size.width - currentDistance, size.height,
() {
particleBuilder(i).paint(canvas, size, progress, seed); particleBuilder(i).paint(canvas, size, progress, seed);
}); });
} else if (side == 3) { } else if (side == 3) {
@ -233,7 +255,8 @@ class RectangleMirror extends Particle {
canvas.restore(); canvas.restore();
} }
void moveTo(Canvas canvas, Size size, int side, double x, double y, VoidCallback painter) { void moveTo(Canvas canvas, Size size, int side, double x, double y,
VoidCallback painter) {
canvas.save(); canvas.save();
canvas.translate(x, y); canvas.translate(x, y);
canvas.rotate(-atan2(size.width / 2 - x, size.height / 2 - y)); canvas.rotate(-atan2(size.width / 2 - x, size.height / 2 - y));
@ -261,7 +284,9 @@ class PositionedParticle extends Particle {
/// Animates a childs position based on a Tween<Offset> /// Animates a childs position based on a Tween<Offset>
class AnimatedPositionedParticle extends Particle { class AnimatedPositionedParticle extends Particle {
AnimatedPositionedParticle({required Offset begin, required Offset end, required this.child}) : offsetTween = Tween<Offset>(begin: begin, end: end); AnimatedPositionedParticle(
{required Offset begin, required Offset end, required this.child})
: offsetTween = Tween<Offset>(begin: begin, end: end);
final Particle child; final Particle child;
@ -270,7 +295,8 @@ class AnimatedPositionedParticle extends Particle {
@override @override
void paint(Canvas canvas, Size size, double progress, seed) { void paint(Canvas canvas, Size size, double progress, seed) {
canvas.save(); canvas.save();
canvas.translate(offsetTween.lerp(progress).dx, offsetTween.lerp(progress).dy); canvas.translate(
offsetTween.lerp(progress).dx, offsetTween.lerp(progress).dy);
child.paint(canvas, size, progress, seed); child.paint(canvas, size, progress, seed);
canvas.restore(); canvas.restore();
} }
@ -335,7 +361,9 @@ class AnimatedRotationParticle extends Particle {
final Tween<double> rotation; final Tween<double> rotation;
AnimatedRotationParticle({required this.child, required double begin, required double end}) : rotation = Tween<double>(begin: begin, end: end); AnimatedRotationParticle(
{required this.child, required double begin, required double end})
: rotation = Tween<double>(begin: begin, end: end);
@override @override
void paint(Canvas canvas, Size size, double progress, int seed) { void paint(Canvas canvas, Size size, double progress, int seed) {
@ -362,7 +390,8 @@ class FadingRect extends Particle {
@override @override
void paint(Canvas canvas, Size size, double progress, seed) { void paint(Canvas canvas, Size size, double progress, seed) {
canvas.drawRect(Rect.fromLTWH(0.0, 0.0, width, height), Paint()..color = color.withOpacity(1 - progress)); canvas.drawRect(Rect.fromLTWH(0.0, 0.0, width, height),
Paint()..color = color.withValues(alpha: 1 - progress));
} }
} }
@ -375,7 +404,8 @@ class FadingCircle extends Particle {
@override @override
void paint(Canvas canvas, Size size, double progress, seed) { void paint(Canvas canvas, Size size, double progress, seed) {
canvas.drawCircle(Offset.zero, radius, Paint()..color = color.withOpacity(1 - progress)); canvas.drawCircle(Offset.zero, radius,
Paint()..color = color.withValues(alpha: 1 - progress));
} }
} }
@ -394,7 +424,11 @@ class FadingTriangle extends Particle {
/// This is the factor of how much bigger then length than the width is /// This is the factor of how much bigger then length than the width is
final double heightToBaseFactor; final double heightToBaseFactor;
FadingTriangle({required this.variation, required this.color, required this.baseSize, required this.heightToBaseFactor}); FadingTriangle(
{required this.variation,
required this.color,
required this.baseSize,
required this.heightToBaseFactor});
@override @override
void paint(Canvas canvas, Size size, double progress, int seed) { void paint(Canvas canvas, Size size, double progress, int seed) {
@ -403,7 +437,8 @@ class FadingTriangle extends Particle {
path.lineTo(baseSize * variation, baseSize * heightToBaseFactor); path.lineTo(baseSize * variation, baseSize * heightToBaseFactor);
path.lineTo(baseSize, 0.0); path.lineTo(baseSize, 0.0);
path.close(); path.close();
canvas.drawPath(path, Paint()..color = color.withOpacity(1 - progress)); canvas.drawPath(
path, Paint()..color = color.withValues(alpha: 1 - progress));
} }
} }
@ -418,7 +453,12 @@ class FadingSnake extends Particle {
final Color color; final Color color;
FadingSnake({required this.width, required this.segmentLength, required this.segments, required this.curvyness, required this.color}); FadingSnake(
{required this.width,
required this.segmentLength,
required this.segments,
required this.curvyness,
required this.color});
@override @override
void paint(Canvas canvas, Size size, double progress, int seed) { void paint(Canvas canvas, Size size, double progress, int seed) {
@ -426,10 +466,12 @@ class FadingSnake extends Particle {
canvas.rotate(pi / 6); canvas.rotate(pi / 6);
Path path = Path(); Path path = Path();
for (int i = 0; i < segments; i++) { for (int i = 0; i < segments; i++) {
path.quadraticBezierTo(curvyness * i, segmentLength * (i + 1), curvyness * (i + 1), segmentLength * (i + 1)); path.quadraticBezierTo(curvyness * i, segmentLength * (i + 1),
curvyness * (i + 1), segmentLength * (i + 1));
} }
for (int i = segments - 1; i >= 0; i--) { for (int i = segments - 1; i >= 0; i--) {
path.quadraticBezierTo(curvyness * (i + 1), segmentLength * i - curvyness, curvyness * i, segmentLength * i - curvyness); path.quadraticBezierTo(curvyness * (i + 1), segmentLength * i - curvyness,
curvyness * i, segmentLength * i - curvyness);
} }
path.close(); path.close();
canvas.drawPath(path, Paint()..color = color); canvas.drawPath(path, Paint()..color = color);

3
refilc_mobile_ui/lib/pages/messages/send_message/send_message.dart
View File

@ -128,7 +128,8 @@ class SendMessageSheetState extends State<SendMessageSheet> {
.join(), .join(),
style: Theme.of(context).textTheme.titleSmall!.copyWith( style: Theme.of(context).textTheme.titleSmall!.copyWith(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: AppColors.of(context).text.withOpacity(0.75)), color:
AppColors.of(context).text.withValues(alpha: 0.75)),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 2, maxLines: 2,
textAlign: TextAlign.center, textAlign: TextAlign.center,

14
refilc_mobile_ui/lib/pages/notes/submenu/add_note_screen.dart
View File

@ -57,7 +57,10 @@ class AddNoteScreenState extends State<AddNoteScreen> {
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
top: BorderSide( top: BorderSide(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.1), color: Theme.of(context)
.colorScheme
.secondary
.withValues(alpha: 0.1),
width: 1.1, width: 1.1,
), ),
), ),
@ -178,7 +181,10 @@ class AddNoteScreenState extends State<AddNoteScreen> {
} }
}, },
child: Container( child: Container(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.2), color: Theme.of(context)
.colorScheme
.secondary
.withValues(alpha: 0.2),
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Stack( child: Stack(
@ -196,8 +202,8 @@ class AddNoteScreenState extends State<AddNoteScreen> {
data: IconThemeData( data: IconThemeData(
color: color:
Theme.of(context).brightness == Brightness.light Theme.of(context).brightness == Brightness.light
? Colors.black.withOpacity(.5) ? Colors.black.withValues(alpha: .5)
: Colors.white.withOpacity(.3), : Colors.white.withValues(alpha: .3),
), ),
child: const Icon( child: const Icon(
FeatherIcons.check, FeatherIcons.check,

19
refilc_mobile_ui/lib/pages/notes/submenu/note_view_screen.dart
View File

@ -55,8 +55,10 @@ class NoteViewScreenState extends State<NoteViewScreen> {
AddNoteScreen(initialNote: widget.note))); AddNoteScreen(initialNote: widget.note)));
}, },
child: Container( child: Container(
color: color: Theme.of(context)
Theme.of(context).colorScheme.secondary.withOpacity(0.2), .colorScheme
.secondary
.withValues(alpha: 0.2),
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Stack( child: Stack(
@ -74,8 +76,8 @@ class NoteViewScreenState extends State<NoteViewScreen> {
data: IconThemeData( data: IconThemeData(
color: color:
Theme.of(context).brightness == Brightness.light Theme.of(context).brightness == Brightness.light
? Colors.black.withOpacity(.5) ? Colors.black.withValues(alpha: .5)
: Colors.white.withOpacity(.3), : Colors.white.withValues(alpha: .3),
), ),
child: const Icon( child: const Icon(
FeatherIcons.edit, FeatherIcons.edit,
@ -105,7 +107,10 @@ class NoteViewScreenState extends State<NoteViewScreen> {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
child: Container( child: Container(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.2), color: Theme.of(context)
.colorScheme
.secondary
.withValues(alpha: 0.2),
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Stack( child: Stack(
@ -123,8 +128,8 @@ class NoteViewScreenState extends State<NoteViewScreen> {
data: IconThemeData( data: IconThemeData(
color: color:
Theme.of(context).brightness == Brightness.light Theme.of(context).brightness == Brightness.light
? Colors.black.withOpacity(.5) ? Colors.black.withValues(alpha: .5)
: Colors.white.withOpacity(.3), : Colors.white.withValues(alpha: .3),
), ),
child: const Icon( child: const Icon(
FeatherIcons.trash2, FeatherIcons.trash2,

18
refilc_mobile_ui/lib/pages/notes/submenu/notes_screen.dart
View File

@ -173,7 +173,10 @@ class NotesScreenState extends State<NotesScreen> {
SoonAlert.show(context: context); SoonAlert.show(context: context);
}, },
child: Container( child: Container(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.2), color: Theme.of(context)
.colorScheme
.secondary
.withValues(alpha: 0.2),
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Stack( child: Stack(
@ -191,8 +194,8 @@ class NotesScreenState extends State<NotesScreen> {
data: IconThemeData( data: IconThemeData(
color: color:
Theme.of(context).brightness == Brightness.light Theme.of(context).brightness == Brightness.light
? Colors.black.withOpacity(.5) ? Colors.black.withValues(alpha: .5)
: Colors.white.withOpacity(.3), : Colors.white.withValues(alpha: .3),
), ),
child: const Icon( child: const Icon(
FeatherIcons.search, FeatherIcons.search,
@ -225,7 +228,10 @@ class NotesScreenState extends State<NotesScreen> {
builder: (context) => const AddNoteScreen())); builder: (context) => const AddNoteScreen()));
}, },
child: Container( child: Container(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.2), color: Theme.of(context)
.colorScheme
.secondary
.withValues(alpha: 0.2),
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Stack( child: Stack(
@ -243,8 +249,8 @@ class NotesScreenState extends State<NotesScreen> {
data: IconThemeData( data: IconThemeData(
color: color:
Theme.of(context).brightness == Brightness.light Theme.of(context).brightness == Brightness.light
? Colors.black.withOpacity(.5) ? Colors.black.withValues(alpha: .5)
: Colors.white.withOpacity(.3), : Colors.white.withValues(alpha: .3),
), ),
child: const Icon( child: const Icon(
FeatherIcons.plus, FeatherIcons.plus,

4
refilc_mobile_ui/lib/pages/timetable/day_title.dart
View File

@ -63,14 +63,14 @@ class _DayTitleState extends State<DayTitle> {
textStyle: TextStyle( textStyle: TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(opacity), .withValues(alpha: opacity),
fontSize: 32.0, fontSize: 32.0,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
) )
: TextStyle( : TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(opacity), .withValues(alpha: opacity),
fontSize: 32.0, fontSize: 32.0,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),

17
refilc_mobile_ui/lib/pages/timetable/fs_timetable.dart
View File

@ -120,7 +120,7 @@ class _FSTimetableState extends State<FSTimetable> {
if (lessons.isEmpty) continue; if (lessons.isEmpty) continue;
if (index == 0 && dayIndex >= 0) { if (index == 0 && dayIndex >= 0) {
// if (index == 0 || dayIndex >=0) { // if (index == 0 || dayIndex >=0) {
columns.add( columns.add(
SizedBox( SizedBox(
width: colw, width: colw,
@ -157,13 +157,14 @@ class _FSTimetableState extends State<FSTimetable> {
Icon( Icon(
FeatherIcons.slash, FeatherIcons.slash,
size: 18.0, size: 18.0,
color: AppColors.of(context).text.withOpacity(.3), color: AppColors.of(context).text.withValues(alpha: .3),
), ),
const SizedBox(width: 8.0), const SizedBox(width: 8.0),
Text( Text(
"Lyukas óra", "Lyukas óra",
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.3), color:
AppColors.of(context).text.withValues(alpha: .3),
), ),
), ),
], ],
@ -205,7 +206,9 @@ class _FSTimetableState extends State<FSTimetable> {
subject: lsn.subject, subject: lsn.subject,
), ),
size: 18.0, size: 18.0,
color: AppColors.of(context).text.withOpacity(.7), color: AppColors.of(context)
.text
.withValues(alpha: .7),
), ),
const SizedBox(width: 8.0), const SizedBox(width: 8.0),
Expanded( Expanded(
@ -231,7 +234,9 @@ class _FSTimetableState extends State<FSTimetable> {
child: Text( child: Text(
lsn.room, lsn.room,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.5), color: AppColors.of(context)
.text
.withValues(alpha: .5),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
), ),
@ -251,4 +256,4 @@ class _FSTimetableState extends State<FSTimetable> {
), ),
); );
} }
} }

28
refilc_mobile_ui/lib/pages/timetable/timetable_page.dart
View File

@ -585,7 +585,8 @@ class TimetablePageState extends State<TimetablePage>
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(0.25), .withValues(
alpha: 0.25),
), ),
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius.circular(
@ -615,8 +616,9 @@ class TimetablePageState extends State<TimetablePage>
color: AppColors.of( color: AppColors.of(
context) context)
.text .text
.withOpacity( .withValues(
0.90), alpha:
0.90),
), ),
child: Text( child: Text(
'break'.i18n, 'break'.i18n,
@ -661,8 +663,8 @@ class TimetablePageState extends State<TimetablePage>
context) context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity( .withValues(
.5), alpha: .5),
size: 10.0, size: 10.0,
) )
], ],
@ -775,11 +777,11 @@ class TimetablePageState extends State<TimetablePage>
// Label // Label
labelPadding: EdgeInsets.zero, labelPadding: EdgeInsets.zero,
labelColor: labelColor:
AppColors.of(context).text.withOpacity(0.9), AppColors.of(context).text.withValues(alpha: 0.9),
unselectedLabelColor: Theme.of(context) unselectedLabelColor: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(0.25) .withValues(alpha: 0.25)
.withAlpha(100), .withAlpha(100),
// Indicator // Indicator
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.tab,
@ -791,15 +793,15 @@ class TimetablePageState extends State<TimetablePage>
// border: Border.all( // border: Border.all(
// color: AppColors.of(context) // color: AppColors.of(context)
// .text // .text
// .withOpacity(0.90)), // .withValues(alpha: 0.90)),
// color: Theme.of(context) // color: Theme.of(context)
// .colorScheme // .colorScheme
// .secondary // .secondary
// .withOpacity(0.25), // .withValues(alpha: 0.25),
borderRadius: BorderRadius.circular(16.0), borderRadius: BorderRadius.circular(16.0),
), ),
overlayColor: WidgetStateProperty.all( overlayColor:
const Color(0x00000000)), WidgetStateProperty.all(const Color(0x00000000)),
// Tabs // Tabs
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
vertical: 6.0, horizontal: 24.0), vertical: 6.0, horizontal: 24.0),
@ -823,7 +825,7 @@ class TimetablePageState extends State<TimetablePage>
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(0.25) .withValues(alpha: 0.25)
.withAlpha(100)), .withAlpha(100)),
), ),
Text( Text(
@ -851,7 +853,7 @@ class TimetablePageState extends State<TimetablePage>
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(0.25) .withValues(alpha: 0.25)
.withAlpha(100), .withAlpha(100),
), ),
), ),

4
refilc_mobile_ui/lib/plus/components/active_sponsor_card.dart
View File

@ -78,7 +78,7 @@ class ActiveSponsorCard extends StatelessWidget {
borderRadius: BorderRadius.circular(20.0), borderRadius: BorderRadius.circular(20.0),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: glow.withOpacity(.4), color: glow.withValues(alpha: .4),
blurRadius: 42.0, blurRadius: 42.0,
), ),
], ],
@ -91,7 +91,7 @@ class ActiveSponsorCard extends StatelessWidget {
RoundedRectangleBorder(borderRadius: BorderRadius.circular(14.0)), RoundedRectangleBorder(borderRadius: BorderRadius.circular(14.0)),
child: InkWell( child: InkWell(
borderRadius: BorderRadius.circular(14.0), borderRadius: BorderRadius.circular(14.0),
splashColor: glow.withOpacity(.2), splashColor: glow.withValues(alpha: .2),
onTap: () { onTap: () {
Navigator.of(context, rootNavigator: true) Navigator.of(context, rootNavigator: true)
.push(MaterialPageRoute(builder: (context) { .push(MaterialPageRoute(builder: (context) {

6
refilc_mobile_ui/lib/plus/components/github_card.dart
View File

@ -19,7 +19,9 @@ class GithubCard extends StatelessWidget {
borderRadius: BorderRadius.circular(14.0), borderRadius: BorderRadius.circular(14.0),
onTap: onPressed, onTap: onPressed,
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0).add(const EdgeInsets.only(top: 4.0)), padding:
const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0)
.add(const EdgeInsets.only(top: 4.0)),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -36,7 +38,7 @@ class GithubCard extends StatelessWidget {
), ),
const SizedBox(height: 4.0), const SizedBox(height: 4.0),
Chip( Chip(
backgroundColor: Colors.black.withOpacity(.5), backgroundColor: Colors.black.withValues(alpha: .5),
label: const Text( label: const Text(
"Már támogatsz? Jelentkezz be!", "Már támogatsz? Jelentkezz be!",
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),

5
refilc_mobile_ui/lib/plus/components/goal_card.dart
View File

@ -30,7 +30,7 @@ class PremiumGoalCard extends StatelessWidget {
Container( Container(
height: 12, height: 12,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.black.withOpacity(.2), color: Colors.black.withValues(alpha: .2),
borderRadius: BorderRadius.circular(45.0), borderRadius: BorderRadius.circular(45.0),
), ),
), ),
@ -59,7 +59,8 @@ class PremiumGoalCard extends StatelessWidget {
imageFilter: imageFilter:
ImageFilter.blur(sigmaX: 5, sigmaY: 5), ImageFilter.blur(sigmaX: 5, sigmaY: 5),
child: Image.asset("assets/images/heart.png", child: Image.asset("assets/images/heart.png",
color: Colors.black.withOpacity(.3)), color:
Colors.black.withValues(alpha: .3)),
), ),
Image.asset("assets/images/heart.png"), Image.asset("assets/images/heart.png"),
], ],

4
refilc_mobile_ui/lib/plus/components/plan_card.dart
View File

@ -159,7 +159,7 @@ class PlusPlanCard extends StatelessWidget {
), ),
shadowColor: Colors.transparent, shadowColor: Colors.transparent,
surfaceTintColor: Colors.white, surfaceTintColor: Colors.white,
color: Colors.white.withOpacity(0.9), color: Colors.white.withValues(alpha: 0.9),
child: Padding( child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
top: 18.0, bottom: 16.0, left: 22.0, right: 18.0), top: 18.0, bottom: 16.0, left: 22.0, right: 18.0),
@ -237,7 +237,7 @@ class PlusPlanCard extends StatelessWidget {
Text( Text(
description, description,
style: TextStyle( style: TextStyle(
color: const Color(0xFF011234).withOpacity(0.6), color: const Color(0xFF011234).withValues(alpha: 0.6),
fontSize: 13.69, fontSize: 13.69,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),

2
refilc_mobile_ui/lib/plus/components/supporter_group_card.dart
View File

@ -27,7 +27,7 @@ class SupporterGroupCard extends StatelessWidget {
boxShadow: [ boxShadow: [
if (glow != null) if (glow != null)
BoxShadow( BoxShadow(
color: glow!.withOpacity(.2), color: glow!.withValues(alpha: .2),
blurRadius: 60.0, blurRadius: 60.0,
), ),
], ],

47
refilc_mobile_ui/lib/plus/plus_screen.dart
View File

@ -77,11 +77,11 @@ class PlusScreenState extends State<PlusScreen> {
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
const Color(0xffF4F9FF).withOpacity(0.30), const Color(0xffF4F9FF).withValues(alpha: 0.30),
const Color(0xffF4F9FF).withOpacity(0.40), const Color(0xffF4F9FF).withValues(alpha: 0.40),
const Color(0xffF4F9FF).withOpacity(0.50), const Color(0xffF4F9FF).withValues(alpha: 0.50),
const Color(0xffF4F9FF).withOpacity(0.60), const Color(0xffF4F9FF).withValues(alpha: 0.60),
const Color(0xffF4F9FF).withOpacity(0.70), const Color(0xffF4F9FF).withValues(alpha: 0.70),
], ],
begin: Alignment.topCenter, begin: Alignment.topCenter,
end: Alignment.bottomCenter, end: Alignment.bottomCenter,
@ -94,10 +94,10 @@ class PlusScreenState extends State<PlusScreen> {
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
const Color(0xffF4F9FF).withOpacity(0.0), const Color(0xffF4F9FF).withValues(alpha: 0.0),
const Color(0xffF4F9FF).withOpacity(0.7), const Color(0xffF4F9FF).withValues(alpha: 0.7),
const Color(0xffF4F9FF).withOpacity(0.8), const Color(0xffF4F9FF).withValues(alpha: 0.8),
const Color(0xffF4F9FF).withOpacity(0.9), const Color(0xffF4F9FF).withValues(alpha: 0.9),
const Color(0xffF4F9FF), const Color(0xffF4F9FF),
], ],
begin: Alignment.topCenter, begin: Alignment.topCenter,
@ -155,7 +155,7 @@ class PlusScreenState extends State<PlusScreen> {
style: TextStyle( style: TextStyle(
fontSize: 14.4, fontSize: 14.4,
color: const Color(0xFF0A1C41) color: const Color(0xFF0A1C41)
.withOpacity(0.5), .withValues(alpha: 0.5),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
@ -182,7 +182,7 @@ class PlusScreenState extends State<PlusScreen> {
'2', '2',
style: TextStyle( style: TextStyle(
color: const Color(0xFF011234) color: const Color(0xFF011234)
.withOpacity(0.5), .withValues(alpha: 0.5),
fontSize: 10.0, fontSize: 10.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
@ -194,7 +194,8 @@ class PlusScreenState extends State<PlusScreen> {
), ),
], ],
style: TextStyle( style: TextStyle(
color: const Color(0xFF011234).withOpacity(0.6), color: const Color(0xFF011234)
.withValues(alpha: 0.6),
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
@ -300,7 +301,7 @@ class PlusScreenState extends State<PlusScreen> {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16.0), borderRadius: BorderRadius.circular(16.0),
border: Border.all( border: Border.all(
color: Colors.black.withOpacity(0.2), color: Colors.black.withValues(alpha: 0.2),
), ),
), ),
child: SwitchListTile( child: SwitchListTile(
@ -329,7 +330,7 @@ class PlusScreenState extends State<PlusScreen> {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16.0), borderRadius: BorderRadius.circular(16.0),
border: Border.all( border: Border.all(
color: Colors.black.withOpacity(0.2), color: Colors.black.withValues(alpha: 0.2),
), ),
), ),
child: ListTile( child: ListTile(
@ -427,7 +428,7 @@ class PlusScreenState extends State<PlusScreen> {
// decoration: BoxDecoration( // decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(16.0), // borderRadius: BorderRadius.circular(16.0),
// border: Border.all( // border: Border.all(
// color: Colors.black.withOpacity(0.2), // color: Colors.black.withValues(alpha: 0.2),
// ), // ),
// ), // ),
// child: CheckboxListTile( // child: CheckboxListTile(
@ -462,7 +463,7 @@ class PlusScreenState extends State<PlusScreen> {
// 'A szolgáltatási csomag kiválasztásával (megérintés) elfogadod a reFilc előfizetésekkel kapcsolatos Általános Szerződési Feltételeit (elérhető az alábbi link-en: filc.one/pay-terms), valamint Adatkezelési Tájékoztatónkat (elérhető az alábbi link-en: filc.one/pay-privacy).', // 'A szolgáltatási csomag kiválasztásával (megérintés) elfogadod a reFilc előfizetésekkel kapcsolatos Általános Szerződési Feltételeit (elérhető az alábbi link-en: filc.one/pay-terms), valamint Adatkezelési Tájékoztatónkat (elérhető az alábbi link-en: filc.one/pay-privacy).',
// textAlign: TextAlign.justify, // textAlign: TextAlign.justify,
// style: // style:
// TextStyle(color: Colors.black.withOpacity(0.9)), // TextStyle(color: Colors.black.withValues(alpha: 0.9)),
// ), // ),
// ), // ),
// faq section // faq section
@ -474,7 +475,8 @@ class PlusScreenState extends State<PlusScreen> {
child: Text( child: Text(
'faq'.i18n, 'faq'.i18n,
style: TextStyle( style: TextStyle(
color: const Color(0xFF011234).withOpacity(0.6), color:
const Color(0xFF011234).withValues(alpha: 0.6),
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
@ -518,7 +520,7 @@ class PlusScreenState extends State<PlusScreen> {
TextSpan( TextSpan(
style: TextStyle( style: TextStyle(
color: const Color(0xFF011234) color: const Color(0xFF011234)
.withOpacity(0.6), .withValues(alpha: 0.6),
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
children: [ children: [
@ -532,7 +534,7 @@ class PlusScreenState extends State<PlusScreen> {
'3', '3',
style: TextStyle( style: TextStyle(
color: const Color(0xFF011234) color: const Color(0xFF011234)
.withOpacity(0.5), .withValues(alpha: 0.5),
fontSize: 10.0, fontSize: 10.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
@ -587,8 +589,8 @@ class PlusScreenState extends State<PlusScreen> {
Text( Text(
'o_1'.i18n, 'o_1'.i18n,
style: TextStyle( style: TextStyle(
color: color: const Color(0xFF011234)
const Color(0xFF011234).withOpacity(0.6), .withValues(alpha: 0.6),
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
@ -604,7 +606,8 @@ class PlusScreenState extends State<PlusScreen> {
child: Text( child: Text(
'desc'.i18n, 'desc'.i18n,
style: TextStyle( style: TextStyle(
color: const Color(0xFF011234).withOpacity(0.6), color:
const Color(0xFF011234).withValues(alpha: 0.6),
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),

4
refilc_mobile_ui/lib/plus/supporters_screen.dart
View File

@ -59,7 +59,9 @@ class SupportersScreen extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 20.0, fontSize: 20.0,
color: AppColors.of(context).text.withOpacity(.7)), color: AppColors.of(context)
.text
.withValues(alpha: .7)),
), ),
), ),
), ),

7
refilc_mobile_ui/lib/screens/error_report_screen.dart
View File

@ -31,7 +31,7 @@ class ErrorReportScreen extends StatelessWidget {
child: Text( child: Text(
"ekretaYou".i18n, "ekretaYou".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(0.7), color: AppColors.of(context).text.withValues(alpha: 0.7),
fontSize: 24.0, fontSize: 24.0,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
@ -88,7 +88,8 @@ class ErrorReportScreen extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontFamily: 'GeistMono', fontFamily: 'GeistMono',
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context).text.withOpacity(0.9), color:
AppColors.of(context).text.withValues(alpha: 0.9),
), ),
), ),
), ),
@ -276,4 +277,4 @@ class ErrorDetail extends StatelessWidget {
), ),
); );
} }
} }

12
refilc_mobile_ui/lib/screens/login/login_input.dart
View File

@ -55,7 +55,7 @@ class _LoginInputState extends State<LoginInput> {
obscureText: obscure, obscureText: obscure,
scrollPhysics: const BouncingScrollPhysics(), scrollPhysics: const BouncingScrollPhysics(),
decoration: InputDecoration( decoration: InputDecoration(
// fillColor: Colors.black.withOpacity(0.15), // fillColor: Colors.black.withValues(alpha: 0.15),
filled: false, filled: false,
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12.0), borderRadius: BorderRadius.circular(12.0),
@ -104,13 +104,17 @@ class _LoginInputState extends State<LoginInput> {
icon: widget.style == LoginInputStyle.password icon: widget.style == LoginInputStyle.password
? Icon( ? Icon(
obscure ? FeatherIcons.eye : FeatherIcons.eyeOff, obscure ? FeatherIcons.eye : FeatherIcons.eyeOff,
color: AppColors.of(context).text.withOpacity(0.8), color: AppColors.of(context)
.text
.withValues(alpha: 0.8),
weight: 0.1, weight: 0.1,
size: 18.0, size: 18.0,
) )
: Icon( : Icon(
FeatherIcons.x, FeatherIcons.x,
color: AppColors.of(context).text.withOpacity(0.8), color: AppColors.of(context)
.text
.withValues(alpha: 0.8),
weight: 0.1, weight: 0.1,
size: 20.0, size: 20.0,
), ),
@ -122,7 +126,7 @@ class _LoginInputState extends State<LoginInput> {
style: TextStyle( style: TextStyle(
fontSize: 14.0, fontSize: 14.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context).text.withOpacity(0.8), color: AppColors.of(context).text.withValues(alpha: 0.8),
), ),
); );
} }

2
refilc_mobile_ui/lib/screens/login/school_input/school_input.dart
View File

@ -88,7 +88,7 @@ class SchoolInputState extends State<SchoolInput> {
width: double.infinity, width: double.infinity,
padding: const EdgeInsets.symmetric(vertical: 10.0), padding: const EdgeInsets.symmetric(vertical: 10.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.black.withOpacity(0.15), color: Colors.black.withValues(alpha: 0.15),
borderRadius: BorderRadius.circular(12.0), borderRadius: BorderRadius.circular(12.0),
), ),
child: const Center( child: const Center(

6
refilc_mobile_ui/lib/screens/navigation/navbar_item.dart
View File

@ -34,7 +34,7 @@ class NavbarItem extends StatelessWidget {
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: active color: active
? Theme.of(context).colorScheme.tertiary.withOpacity(.2) ? Theme.of(context).colorScheme.tertiary.withValues(alpha: .2)
: null, : null,
borderRadius: BorderRadius.circular(14.0), borderRadius: BorderRadius.circular(14.0),
), ),
@ -50,8 +50,8 @@ class NavbarItem extends StatelessWidget {
// IconTheme( // IconTheme(
// data: IconThemeData( // data: IconThemeData(
// color: Theme.of(context).brightness == Brightness.light // color: Theme.of(context).brightness == Brightness.light
// ? Colors.black.withOpacity(.5) // ? Colors.black.withValues(alpha: .5)
// : Colors.white.withOpacity(.3), // : Colors.white.withValues(alpha: .3),
// ), // ),
// child: icon, // child: icon,
// ), // ),

6
refilc_mobile_ui/lib/screens/navigation/status_bar.dart
View File

@ -59,8 +59,10 @@ class StatusBarState extends State<StatusBar> {
statusProvider.progress - statusProvider.progress -
36.0, 36.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: color: Theme.of(context)
Theme.of(context).colorScheme.secondary.withOpacity(0.8), .colorScheme
.secondary
.withValues(alpha: 0.8),
borderRadius: BorderRadius.circular(45.0), borderRadius: BorderRadius.circular(45.0),
), ),
), ),

2
refilc_mobile_ui/lib/screens/settings/accounts/account_tile.dart
View File

@ -37,7 +37,7 @@ class AccountTile extends StatelessWidget {
splashRadius: 24.0, splashRadius: 24.0,
onPressed: onTapMenu, onPressed: onTapMenu,
icon: Icon(FeatherIcons.moreVertical, icon: Icon(FeatherIcons.moreVertical,
color: AppColors.of(context).text.withOpacity(0.8)), color: AppColors.of(context).text.withValues(alpha: 0.8)),
), ),
) )
: null, : null,

16
refilc_mobile_ui/lib/screens/settings/modify_subject_names.dart
View File

@ -49,12 +49,12 @@ class MenuRenamedSubjects extends StatelessWidget {
style: TextStyle( style: TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(settings.renamedSubjectsEnabled ? 1.0 : .5)), .withValues(alpha: settings.renamedSubjectsEnabled ? 1.0 : .5)),
), ),
leading: settings.renamedSubjectsEnabled leading: settings.renamedSubjectsEnabled
? const Icon(FeatherIcons.penTool) ? const Icon(FeatherIcons.penTool)
: Icon(FeatherIcons.penTool, : Icon(FeatherIcons.penTool,
color: AppColors.of(context).text.withOpacity(.25)), color: AppColors.of(context).text.withValues(alpha: .25)),
trailingDivider: true, trailingDivider: true,
trailing: Switch( trailing: Switch(
onChanged: (v) async { onChanged: (v) async {
@ -200,7 +200,8 @@ class _ModifySubjectNamesState extends State<ModifySubjectNames> {
.name, .name,
style: Theme.of(context).textTheme.titleSmall!.copyWith( style: Theme.of(context).textTheme.titleSmall!.copyWith(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: AppColors.of(context).text.withOpacity(0.75)), color:
AppColors.of(context).text.withValues(alpha: 0.75)),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 2, maxLines: 2,
textAlign: TextAlign.center, textAlign: TextAlign.center,
@ -330,7 +331,8 @@ class _ModifySubjectNamesState extends State<ModifySubjectNames> {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 18, fontSize: 18,
color: AppColors.of(context).text.withOpacity(.85), color:
AppColors.of(context).text.withValues(alpha: .85),
), ),
), ),
), ),
@ -414,7 +416,7 @@ class RenamedSubjectItem extends StatelessWidget {
onTap: () {}, onTap: () {},
leading: Icon( leading: Icon(
SubjectIcon.resolveVariant(subject: subject, context: context), SubjectIcon.resolveVariant(subject: subject, context: context),
color: AppColors.of(context).text.withOpacity(.75)), color: AppColors.of(context).text.withValues(alpha: .75)),
title: InkWell( title: InkWell(
onTap: modifyCallback, onTap: modifyCallback,
child: Column( child: Column(
@ -425,7 +427,7 @@ class RenamedSubjectItem extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 14, fontSize: 14,
color: AppColors.of(context).text.withOpacity(.75)), color: AppColors.of(context).text.withValues(alpha: .75)),
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
@ -441,7 +443,7 @@ class RenamedSubjectItem extends StatelessWidget {
trailing: InkWell( trailing: InkWell(
onTap: removeCallback, onTap: removeCallback,
child: Icon(FeatherIcons.trash, child: Icon(FeatherIcons.trash,
color: AppColors.of(context).red.withOpacity(.75)), color: AppColors.of(context).red.withValues(alpha: .75)),
), ),
); );
} }

22
refilc_mobile_ui/lib/screens/settings/notifications_screen.dart
View File

@ -43,12 +43,12 @@
// leading: Icon( // leading: Icon(
// FeatherIcons.messageCircle, // FeatherIcons.messageCircle,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity(0.95), // color: AppColors.of(context).text.withValues(alpha: 0.95),
// ), // ),
// trailing: Icon( // trailing: Icon(
// FeatherIcons.chevronRight, // FeatherIcons.chevronRight,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity(0.95), // color: AppColors.of(context).text.withValues(alpha: 0.95),
// ), // ),
// borderRadius: borderRadius, // borderRadius: borderRadius,
// ); // );
@ -105,14 +105,14 @@
// title: Text( // title: Text(
// "grades".i18n, // "grades".i18n,
// style: TextStyle( // style: TextStyle(
// color: AppColors.of(context).text.withOpacity( // color: AppColors.of(context).text.withValues(alpha:
// settings.notificationsGradesEnabled ? .95 : .25), // settings.notificationsGradesEnabled ? .95 : .25),
// ), // ),
// ), // ),
// leading: Icon( // leading: Icon(
// FeatherIcons.bookmark, // FeatherIcons.bookmark,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity( // color: AppColors.of(context).text.withValues(alpha:
// settings.notificationsGradesEnabled ? .95 : .25), // settings.notificationsGradesEnabled ? .95 : .25),
// ), // ),
// trailing: Switch( // trailing: Switch(
@ -144,14 +144,14 @@
// title: Text( // title: Text(
// "absences".i18n, // "absences".i18n,
// style: TextStyle( // style: TextStyle(
// color: AppColors.of(context).text.withOpacity( // color: AppColors.of(context).text.withValues(alpha:
// settings.notificationsAbsencesEnabled ? .95 : .25), // settings.notificationsAbsencesEnabled ? .95 : .25),
// ), // ),
// ), // ),
// leading: Icon( // leading: Icon(
// FeatherIcons.clock, // FeatherIcons.clock,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity( // color: AppColors.of(context).text.withValues(alpha:
// settings.notificationsAbsencesEnabled ? .95 : .25), // settings.notificationsAbsencesEnabled ? .95 : .25),
// ), // ),
// trailing: Switch( // trailing: Switch(
@ -183,14 +183,14 @@
// title: Text( // title: Text(
// "messages".i18n, // "messages".i18n,
// style: TextStyle( // style: TextStyle(
// color: AppColors.of(context).text.withOpacity( // color: AppColors.of(context).text.withValues(alpha:
// settings.notificationsMessagesEnabled ? .95 : .25), // settings.notificationsMessagesEnabled ? .95 : .25),
// ), // ),
// ), // ),
// leading: Icon( // leading: Icon(
// FeatherIcons.messageSquare, // FeatherIcons.messageSquare,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity( // color: AppColors.of(context).text.withValues(alpha:
// settings.notificationsMessagesEnabled ? .95 : .25), // settings.notificationsMessagesEnabled ? .95 : .25),
// ), // ),
// trailing: Switch( // trailing: Switch(
@ -222,14 +222,14 @@
// title: Text( // title: Text(
// "lessons".i18n, // "lessons".i18n,
// style: TextStyle( // style: TextStyle(
// color: AppColors.of(context).text.withOpacity( // color: AppColors.of(context).text.withValues(alpha:
// settings.notificationsLessonsEnabled ? .95 : .25), // settings.notificationsLessonsEnabled ? .95 : .25),
// ), // ),
// ), // ),
// leading: Icon( // leading: Icon(
// FeatherIcons.bookmark, // FeatherIcons.bookmark,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity( // color: AppColors.of(context).text.withValues(alpha:
// settings.notificationsLessonsEnabled ? .95 : .25), // settings.notificationsLessonsEnabled ? .95 : .25),
// ), // ),
// trailing: Switch( // trailing: Switch(
@ -259,7 +259,7 @@
// leading: Icon( // leading: Icon(
// FeatherIcons.mail, // FeatherIcons.mail,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity(0.95), // color: AppColors.of(context).text.withValues(alpha: 0.95),
// ), // ),
// borderRadius: const BorderRadius.vertical( // borderRadius: const BorderRadius.vertical(
// top: Radius.circular(12.0), // top: Radius.circular(12.0),

10
refilc_mobile_ui/lib/screens/settings/settings_helper.dart
View File

@ -401,10 +401,8 @@ class SettingsHelper {
width: 12.0, width: 12.0,
height: 12.0, height: 12.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context) color: Theme.of(context).colorScheme.secondary.withValues(
.colorScheme alpha: (index + 1) / (vibrationTitle.length + 1)),
.secondary
.withOpacity((index + 1) / (vibrationTitle.length + 1)),
shape: BoxShape.circle, shape: BoxShape.circle,
), ),
), ),
@ -448,7 +446,7 @@ class SettingsHelper {
// width: 175.0, // width: 175.0,
// decoration: BoxDecoration( // decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(12.0), // borderRadius: BorderRadius.circular(12.0),
// color: AppColors.of(context).text.withOpacity(.25), // color: AppColors.of(context).text.withValues(alpha: .25),
// ), // ),
// ), // ),
// ); // );
@ -745,7 +743,7 @@ class _BellDelaySettingState extends State<BellDelaySetting>
style: TextStyle( style: TextStyle(
fontSize: 12.0, fontSize: 12.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.of(context).text.withOpacity(.75))), color: AppColors.of(context).text.withValues(alpha: .75))),
Padding( Padding(
padding: const EdgeInsets.only(bottom: 12.0, top: 6.0), padding: const EdgeInsets.only(bottom: 12.0, top: 6.0),
child: Column( child: Column(

82
refilc_mobile_ui/lib/screens/settings/settings_screen.dart
View File

@ -326,7 +326,7 @@ class SettingsScreenState extends State<SettingsScreen>
// onPressed: () => // onPressed: () =>
// _showBottomSheet(user.getUser(user.id ?? "")), // _showBottomSheet(user.getUser(user.id ?? "")),
// icon: Icon(FeatherIcons.moreVertical, // icon: Icon(FeatherIcons.moreVertical,
// color: AppColors.of(context).text.withOpacity(0.8)), // color: AppColors.of(context).text.withValues(alpha: 0.8)),
// ), // ),
// const SizedBox( // const SizedBox(
// width: 5, // width: 5,
@ -345,7 +345,7 @@ class SettingsScreenState extends State<SettingsScreen>
// ), // ),
// // _showBottomSheet(user.getUser(user.id ?? "")), // // _showBottomSheet(user.getUser(user.id ?? "")),
// icon: Icon(FeatherIcons.fileText, // icon: Icon(FeatherIcons.fileText,
// color: AppColors.of(context).text.withOpacity(0.8)), // color: AppColors.of(context).text.withValues(alpha: 0.8)),
// ), // ),
], ],
), ),
@ -358,7 +358,9 @@ class SettingsScreenState extends State<SettingsScreen>
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
icon: Icon(FeatherIcons.x, icon: Icon(FeatherIcons.x,
color: AppColors.of(context).text.withOpacity(0.8)), color: AppColors.of(context)
.text
.withValues(alpha: 0.8)),
), ),
const SizedBox( const SizedBox(
width: 5.0, width: 5.0,
@ -424,7 +426,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.info, FeatherIcons.info,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
borderRadius: const BorderRadius.vertical( borderRadius: const BorderRadius.vertical(
top: Radius.circular(12.0), bottom: Radius.circular(4.0)), top: Radius.circular(12.0), bottom: Radius.circular(4.0)),
@ -443,7 +445,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.grid, FeatherIcons.grid,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
borderRadius: const BorderRadius.vertical( borderRadius: const BorderRadius.vertical(
top: Radius.circular(4.0), bottom: Radius.circular(4.0)), top: Radius.circular(4.0), bottom: Radius.circular(4.0)),
@ -456,7 +458,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.edit3, FeatherIcons.edit3,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
borderRadius: const BorderRadius.vertical( borderRadius: const BorderRadius.vertical(
top: Radius.circular(4.0), bottom: Radius.circular(4.0)), top: Radius.circular(4.0), bottom: Radius.circular(4.0)),
@ -476,7 +478,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.users, FeatherIcons.users,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
borderRadius: const BorderRadius.vertical( borderRadius: const BorderRadius.vertical(
top: Radius.circular(4.0), bottom: Radius.circular(4.0)), top: Radius.circular(4.0), bottom: Radius.circular(4.0)),
@ -543,7 +545,7 @@ class SettingsScreenState extends State<SettingsScreen>
// width: 75.0, // width: 75.0,
// decoration: BoxDecoration( // decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(12.0), // borderRadius: BorderRadius.circular(12.0),
// color: AppColors.of(context).text.withOpacity(.25), // color: AppColors.of(context).text.withValues(alpha: .25),
// ), // ),
// ), // ),
// ), // ),
@ -781,14 +783,18 @@ class SettingsScreenState extends State<SettingsScreen>
title: Text( title: Text(
"grade_streak".i18n, "grade_streak".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context)
.text
.withValues(alpha: 0.95),
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
subtitle: Text( subtitle: Text(
"grade_streak_subtitle".i18n, "grade_streak_subtitle".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(0.75), color: AppColors.of(context)
.text
.withValues(alpha: 0.75),
), ),
), ),
leading: Image.asset( leading: Image.asset(
@ -802,7 +808,9 @@ class SettingsScreenState extends State<SettingsScreen>
trailing: Text( trailing: Text(
"${user.gradeStreak}", "${user.gradeStreak}",
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context)
.text
.withValues(alpha: 0.95),
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 18.0, fontSize: 18.0,
), ),
@ -842,7 +850,7 @@ class SettingsScreenState extends State<SettingsScreen>
// leading: Icon( // leading: Icon(
// FeatherIcons.link, // FeatherIcons.link,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity(0.95), // color: AppColors.of(context).text.withValues(alpha: 0.95),
// ), // ),
// trailing: GestureDetector( // trailing: GestureDetector(
// onTap: () { // onTap: () {
@ -869,7 +877,7 @@ class SettingsScreenState extends State<SettingsScreen>
// child: Icon( // child: Icon(
// FeatherIcons.helpCircle, // FeatherIcons.helpCircle,
// size: 20.0, // size: 20.0,
// color: AppColors.of(context).text.withOpacity(0.95), // color: AppColors.of(context).text.withValues(alpha: 0.95),
// ), // ),
// ), // ),
// borderRadius: const BorderRadius.vertical( // borderRadius: const BorderRadius.vertical(
@ -930,7 +938,9 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.sun, FeatherIcons.sun,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context)
.text
.withValues(alpha: 0.95),
), ),
trailing: Text( trailing: Text(
themeModeText, themeModeText,
@ -1023,7 +1033,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
Icons.qr_code, Icons.qr_code,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
title: Text("qr_scanner".i18n), title: Text("qr_scanner".i18n),
onPressed: () => Navigator.of(context).push( onPressed: () => Navigator.of(context).push(
@ -1040,7 +1050,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.mail, FeatherIcons.mail,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
title: Text("news".i18n), title: Text("news".i18n),
onPressed: () => _openNews(context), onPressed: () => _openNews(context),
@ -1053,7 +1063,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.map, FeatherIcons.map,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
title: Text("stickermap".i18n), title: Text("stickermap".i18n),
onPressed: () => launchUrl( onPressed: () => launchUrl(
@ -1104,7 +1114,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.lock, FeatherIcons.lock,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
title: Text("privacy".i18n), title: Text("privacy".i18n),
// onPressed: () => launchUrl( // onPressed: () => launchUrl(
@ -1120,7 +1130,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.atSign, FeatherIcons.atSign,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
title: const Text("Discord"), title: const Text("Discord"),
onPressed: () => launchUrl(Uri.parse("https://dc.refilc.hu"), onPressed: () => launchUrl(Uri.parse("https://dc.refilc.hu"),
@ -1134,7 +1144,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.globe, FeatherIcons.globe,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
title: const Text("www.refilc.hu"), title: const Text("www.refilc.hu"),
onPressed: () => launchUrl(Uri.parse("https://www.refilc.hu"), onPressed: () => launchUrl(Uri.parse("https://www.refilc.hu"),
@ -1148,7 +1158,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.github, FeatherIcons.github,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
title: const Text("Github"), title: const Text("Github"),
onPressed: () => launchUrl( onPressed: () => launchUrl(
@ -1163,7 +1173,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.award, FeatherIcons.award,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
title: Text("licenses".i18n), title: Text("licenses".i18n),
onPressed: () => showLicensePage(context: context), onPressed: () => showLicensePage(context: context),
@ -1184,7 +1194,7 @@ class SettingsScreenState extends State<SettingsScreen>
borderRadius: BorderRadius.circular(12.0), borderRadius: BorderRadius.circular(12.0),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black.withOpacity(0.2), color: Colors.black.withValues(alpha: 0.2),
blurRadius: 40.0, blurRadius: 40.0,
) )
], ],
@ -1204,24 +1214,23 @@ class SettingsScreenState extends State<SettingsScreen>
FeatherIcons.barChart2, FeatherIcons.barChart2,
size: 22.0, size: 22.0,
color: settings.analyticsEnabled color: settings.analyticsEnabled
? AppColors.of(context).text.withOpacity(0.95) ? AppColors.of(context).text.withValues(alpha: 0.95)
: AppColors.of(context).text.withOpacity(.25), : AppColors.of(context).text.withValues(alpha: .25),
), ),
title: Text( title: Text(
"Analytics".i18n, "Analytics".i18n,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16.0, fontSize: 16.0,
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settings.analyticsEnabled ? 1.0 : .5), alpha: settings.analyticsEnabled ? 1.0 : .5),
), ),
), ),
subtitle: Text( subtitle: Text(
"Anonymous Usage Analytics".i18n, "Anonymous Usage Analytics".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context) color: AppColors.of(context).text.withValues(
.text alpha: settings.analyticsEnabled ? .5 : .2),
.withOpacity(settings.analyticsEnabled ? .5 : .2),
), ),
), ),
onChanged: (v) { onChanged: (v) {
@ -1244,7 +1253,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
Icons.feedback_outlined, Icons.feedback_outlined,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
title: Text("feedback".i18n), title: Text("feedback".i18n),
onPressed: () => { onPressed: () => {
@ -1320,7 +1329,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
Icons.tune_outlined, Icons.tune_outlined,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context).text.withValues(alpha: .95),
), ),
title: Text("exp_settings".i18n), title: Text("exp_settings".i18n),
onPressed: () => Clipboard.setData(ClipboardData( onPressed: () => Clipboard.setData(ClipboardData(
@ -1338,7 +1347,7 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.copy, FeatherIcons.copy,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context).text.withValues(alpha: .95),
), ),
title: Text("copy_jwt".i18n), title: Text("copy_jwt".i18n),
onPressed: () => Clipboard.setData(ClipboardData( onPressed: () => Clipboard.setData(ClipboardData(
@ -1355,7 +1364,8 @@ class SettingsScreenState extends State<SettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.key, FeatherIcons.key,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color:
AppColors.of(context).text.withValues(alpha: .95),
), ),
title: const Text("Remove Premium"), title: const Text("Remove Premium"),
onPressed: () { onPressed: () {
@ -1387,7 +1397,7 @@ class SettingsScreenState extends State<SettingsScreen>
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.65)), .withValues(alpha: 0.65)),
child: Text("v${release.data!['version']}"), child: Text("v${release.data!['version']}"),
); );
} else { } else {
@ -1402,7 +1412,7 @@ class SettingsScreenState extends State<SettingsScreen>
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.65)), .withValues(alpha: 0.65)),
child: Text("v$envAppVer"), child: Text("v$envAppVer"),
); );
} }

15
refilc_mobile_ui/lib/screens/settings/submenu/cloud_sync_screen.dart
View File

@ -35,12 +35,13 @@ class MenuCloudSyncSettings extends StatelessWidget {
// ), // ),
title: Text( title: Text(
"cloud_sync".i18n, "cloud_sync".i18n,
style: TextStyle(color: AppColors.of(context).text.withOpacity(0.3)), style:
TextStyle(color: AppColors.of(context).text.withValues(alpha: 0.3)),
), ),
leading: Icon( leading: Icon(
FeatherIcons.uploadCloud, FeatherIcons.uploadCloud,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.25), color: AppColors.of(context).text.withValues(alpha: 0.25),
), ),
borderRadius: borderRadius, borderRadius: borderRadius,
); );
@ -166,8 +167,9 @@ class CloudSyncSettingsScreenState extends State<CloudSyncSettingsScreen> {
title: Text( title: Text(
"qwit_sign_in".i18n, "qwit_sign_in".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.gradeOpeningFun ? .95 : .25), alpha:
settingsProvider.gradeOpeningFun ? .95 : .25),
), ),
), ),
borderRadius: const BorderRadius.vertical( borderRadius: const BorderRadius.vertical(
@ -235,8 +237,9 @@ class CloudSyncSettingsScreenState extends State<CloudSyncSettingsScreen> {
title: Text( title: Text(
"sync_now".i18n, "sync_now".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.gradeOpeningFun ? .95 : .25), alpha:
settingsProvider.gradeOpeningFun ? .95 : .25),
), ),
), ),
borderRadius: const BorderRadius.vertical( borderRadius: const BorderRadius.vertical(

8
refilc_mobile_ui/lib/screens/settings/submenu/edit_subject.dart
View File

@ -111,7 +111,7 @@ class EditSubjectScreenState extends State<EditSubjectScreen> {
leading: Icon( leading: Icon(
FeatherIcons.penTool, FeatherIcons.penTool,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
borderRadius: const BorderRadius.vertical( borderRadius: const BorderRadius.vertical(
top: Radius.circular(12.0), top: Radius.circular(12.0),
@ -134,7 +134,7 @@ class EditSubjectScreenState extends State<EditSubjectScreen> {
leading: Icon( leading: Icon(
FeatherIcons.user, FeatherIcons.user,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
borderRadius: const BorderRadius.vertical( borderRadius: const BorderRadius.vertical(
top: Radius.circular(12.0), top: Radius.circular(12.0),
@ -157,13 +157,13 @@ class EditSubjectScreenState extends State<EditSubjectScreen> {
// title: Text( // title: Text(
// "rounding".i18n, // "rounding".i18n,
// style: TextStyle( // style: TextStyle(
// color: AppColors.of(context).text.withOpacity(.95), // color: AppColors.of(context).text.withValues(alpha: .95),
// ), // ),
// ), // ),
// leading: Icon( // leading: Icon(
// FeatherIcons.gitCommit, // FeatherIcons.gitCommit,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity(.95), // color: AppColors.of(context).text.withValues(alpha: .95),
// ), // ),
// trailing: Text( // trailing: Text(
// ((widget.subject.customRounding ?? // ((widget.subject.customRounding ??

13
refilc_mobile_ui/lib/screens/settings/submenu/extras_screen.dart
View File

@ -38,7 +38,7 @@ class MenuExtrasSettings extends StatelessWidget {
leading: Icon( leading: Icon(
FeatherIcons.edit, FeatherIcons.edit,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
trailing: Row( trailing: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -51,7 +51,7 @@ class MenuExtrasSettings extends StatelessWidget {
Icon( Icon(
FeatherIcons.chevronRight, FeatherIcons.chevronRight,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
) )
], ],
), ),
@ -126,15 +126,16 @@ class ExtrasSettingsScreenState extends State<ExtrasSettingsScreen> {
title: Text( title: Text(
"surprise_grades".i18n, "surprise_grades".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.gradeOpeningFun ? .95 : .25), alpha:
settingsProvider.gradeOpeningFun ? .95 : .25),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.gift, FeatherIcons.gift,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.gradeOpeningFun ? .95 : .25), alpha: settingsProvider.gradeOpeningFun ? .95 : .25),
), ),
trailing: Switch( trailing: Switch(
onChanged: (v) async { onChanged: (v) async {

57
refilc_mobile_ui/lib/screens/settings/submenu/general_screen.dart
View File

@ -30,12 +30,12 @@ class MenuGeneralSettings extends StatelessWidget {
leading: Icon( leading: Icon(
FeatherIcons.settings, FeatherIcons.settings,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
trailing: Icon( trailing: Icon(
FeatherIcons.chevronRight, FeatherIcons.chevronRight,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
borderRadius: borderRadius, borderRadius: borderRadius,
); );
@ -94,8 +94,9 @@ class GeneralSettingsScreenState extends State<GeneralSettingsScreen> {
title: Text( title: Text(
"bell_delay".i18n, "bell_delay".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.bellDelayEnabled ? .95 : .25), alpha:
settingsProvider.bellDelayEnabled ? .95 : .25),
), ),
), ),
leading: Icon( leading: Icon(
@ -103,8 +104,8 @@ class GeneralSettingsScreenState extends State<GeneralSettingsScreen> {
? FeatherIcons.bell ? FeatherIcons.bell
: FeatherIcons.bellOff, : FeatherIcons.bellOff,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.bellDelayEnabled ? .95 : .25), alpha: settingsProvider.bellDelayEnabled ? .95 : .25),
), ),
trailingDivider: true, trailingDivider: true,
trailing: Switch( trailing: Switch(
@ -133,13 +134,14 @@ class GeneralSettingsScreenState extends State<GeneralSettingsScreen> {
title: Text( title: Text(
"rounding".i18n, "rounding".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95), color:
AppColors.of(context).text.withValues(alpha: .95),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.gitCommit, FeatherIcons.gitCommit,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context).text.withValues(alpha: .95),
), ),
trailing: Text( trailing: Text(
(settingsProvider.rounding / 10).toStringAsFixed(1), (settingsProvider.rounding / 10).toStringAsFixed(1),
@ -167,15 +169,15 @@ class GeneralSettingsScreenState extends State<GeneralSettingsScreen> {
title: Text( title: Text(
"graph_class_avg".i18n, "graph_class_avg".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.graphClassAvg ? .95 : .25), alpha: settingsProvider.graphClassAvg ? .95 : .25),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.barChart, FeatherIcons.barChart,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.graphClassAvg ? .95 : .25), alpha: settingsProvider.graphClassAvg ? .95 : .25),
), ),
trailing: Switch( trailing: Switch(
onChanged: (v) => onChanged: (v) =>
@ -203,13 +205,14 @@ class GeneralSettingsScreenState extends State<GeneralSettingsScreen> {
title: Text( title: Text(
"startpage".i18n, "startpage".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95), color:
AppColors.of(context).text.withValues(alpha: .95),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.play, FeatherIcons.play,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context).text.withValues(alpha: .95),
), ),
trailing: Text( trailing: Text(
startPageTitle.capital(), startPageTitle.capital(),
@ -235,13 +238,14 @@ class GeneralSettingsScreenState extends State<GeneralSettingsScreen> {
title: Text( title: Text(
"language".i18n, "language".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95), color:
AppColors.of(context).text.withValues(alpha: .95),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.globe, FeatherIcons.globe,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context).text.withValues(alpha: .95),
), ),
trailing: Text( trailing: Text(
languageText, languageText,
@ -267,13 +271,13 @@ class GeneralSettingsScreenState extends State<GeneralSettingsScreen> {
// title: Text( // title: Text(
// "vibrate".i18n, // "vibrate".i18n,
// style: TextStyle( // style: TextStyle(
// color: AppColors.of(context).text.withOpacity(.95), // color: AppColors.of(context).text.withValues(alpha: .95),
// ), // ),
// ), // ),
// leading: Icon( // leading: Icon(
// FeatherIcons.radio, // FeatherIcons.radio,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity(.95), // color: AppColors.of(context).text.withValues(alpha: .95),
// ), // ),
// trailing: Text( // trailing: Text(
// vibrateTitle, // vibrateTitle,
@ -301,8 +305,8 @@ class GeneralSettingsScreenState extends State<GeneralSettingsScreen> {
title: Text( title: Text(
"show_breaks".i18n, "show_breaks".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.showBreaks ? .95 : .25), alpha: settingsProvider.showBreaks ? .95 : .25),
), ),
), ),
leading: Icon( leading: Icon(
@ -310,9 +314,8 @@ class GeneralSettingsScreenState extends State<GeneralSettingsScreen> {
? FeatherIcons.eye ? FeatherIcons.eye
: FeatherIcons.eyeOff, : FeatherIcons.eyeOff,
size: 22.0, size: 22.0,
color: AppColors.of(context) color: AppColors.of(context).text.withValues(
.text alpha: settingsProvider.showBreaks ? .95 : .25),
.withOpacity(settingsProvider.showBreaks ? .95 : .25),
), ),
trailing: Switch( trailing: Switch(
onChanged: (v) => settingsProvider.update(showBreaks: v), onChanged: (v) => settingsProvider.update(showBreaks: v),
@ -341,15 +344,15 @@ class GeneralSettingsScreenState extends State<GeneralSettingsScreen> {
title: Text( title: Text(
"news".i18n, "news".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.newsEnabled ? .95 : .25), alpha: settingsProvider.newsEnabled ? .95 : .25),
), ),
), ),
leading: Icon( leading: Icon(
Icons.newspaper_outlined, Icons.newspaper_outlined,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.newsEnabled ? .95 : .25), alpha: settingsProvider.newsEnabled ? .95 : .25),
), ),
trailing: Switch( trailing: Switch(
onChanged: (v) => settingsProvider.update(newsEnabled: v), onChanged: (v) => settingsProvider.update(newsEnabled: v),

12
refilc_mobile_ui/lib/screens/settings/submenu/grade_colors.dart
View File

@ -86,7 +86,7 @@ class GradeColorsSettingsScreenState extends State<GradeColorsSettingsScreen> {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.shadow .shadow
.withOpacity(.1), .withValues(alpha: .1),
blurRadius: 10.0, blurRadius: 10.0,
offset: const Offset(0, 5), offset: const Offset(0, 5),
), ),
@ -198,7 +198,7 @@ class GradeColorsSettingsScreenState extends State<GradeColorsSettingsScreen> {
: Theme.of(context) : Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.2), .withValues(alpha: .2),
width: 1.0, width: 1.0,
), ),
borderRadius: BorderRadius.circular(50.0), borderRadius: BorderRadius.circular(50.0),
@ -235,7 +235,7 @@ class GradeColorsSettingsScreenState extends State<GradeColorsSettingsScreen> {
: Theme.of(context) : Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.2), .withValues(alpha: .2),
width: 1.0, width: 1.0,
), ),
borderRadius: BorderRadius.circular(50.0), borderRadius: BorderRadius.circular(50.0),
@ -272,7 +272,7 @@ class GradeColorsSettingsScreenState extends State<GradeColorsSettingsScreen> {
: Theme.of(context) : Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.2), .withValues(alpha: .2),
width: 1.0, width: 1.0,
), ),
borderRadius: BorderRadius.circular(50.0), borderRadius: BorderRadius.circular(50.0),
@ -309,7 +309,7 @@ class GradeColorsSettingsScreenState extends State<GradeColorsSettingsScreen> {
: Theme.of(context) : Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.2), .withValues(alpha: .2),
width: 1.0, width: 1.0,
), ),
borderRadius: BorderRadius.circular(50.0), borderRadius: BorderRadius.circular(50.0),
@ -346,7 +346,7 @@ class GradeColorsSettingsScreenState extends State<GradeColorsSettingsScreen> {
: Theme.of(context) : Theme.of(context)
.colorScheme .colorScheme
.secondary .secondary
.withOpacity(.2), .withValues(alpha: .2),
width: 1.0, width: 1.0,
), ),
borderRadius: BorderRadius.circular(50.0), borderRadius: BorderRadius.circular(50.0),

33
refilc_mobile_ui/lib/screens/settings/submenu/paint_list.dart
View File

@ -42,18 +42,18 @@ class MenuPaintList extends StatelessWidget {
title: Text( title: Text(
"own_paints".i18n, "own_paints".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context).text.withValues(alpha: .95),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.list, FeatherIcons.list,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context).text.withValues(alpha: .95),
), ),
trailing: Icon( trailing: Icon(
FeatherIcons.chevronRight, FeatherIcons.chevronRight,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
borderRadius: borderRadius, borderRadius: borderRadius,
); );
@ -117,13 +117,13 @@ class PaintListScreenState extends State<PaintListScreen>
Text( Text(
t.displayName, t.displayName,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context).text.withValues(alpha: .95),
), ),
), ),
Text( Text(
t.nickname, t.nickname,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.75), color: AppColors.of(context).text.withValues(alpha: .75),
), ),
), ),
], ],
@ -219,13 +219,16 @@ class PaintListScreenState extends State<PaintListScreen>
title: Text( title: Text(
"enter_id".i18n, "enter_id".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context)
.text
.withValues(alpha: .95),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.plus, FeatherIcons.plus,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color:
AppColors.of(context).text.withValues(alpha: .95),
), ),
borderRadius: const BorderRadius.vertical( borderRadius: const BorderRadius.vertical(
top: Radius.circular(12.0), top: Radius.circular(12.0),
@ -264,8 +267,9 @@ class PaintListScreenState extends State<PaintListScreen>
? settingsProvider.currentThemeDisplayName ? settingsProvider.currentThemeDisplayName
: 'no_name'.i18n, : 'no_name'.i18n,
style: TextStyle( style: TextStyle(
color: color: AppColors.of(context)
AppColors.of(context).text.withOpacity(.95), .text
.withValues(alpha: .95),
), ),
), ),
Text( Text(
@ -273,8 +277,9 @@ class PaintListScreenState extends State<PaintListScreen>
? settingsProvider.currentThemeCreator ? settingsProvider.currentThemeCreator
: 'Anonymous', : 'Anonymous',
style: TextStyle( style: TextStyle(
color: color: AppColors.of(context)
AppColors.of(context).text.withOpacity(.65), .text
.withValues(alpha: .65),
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
@ -300,7 +305,7 @@ class PaintListScreenState extends State<PaintListScreen>
BoxShadow( BoxShadow(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.15), .withValues(alpha: 0.15),
offset: const Offset(1, 2), offset: const Offset(1, 2),
blurRadius: 3, blurRadius: 3,
), ),
@ -323,7 +328,7 @@ class PaintListScreenState extends State<PaintListScreen>
BoxShadow( BoxShadow(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.15), .withValues(alpha: 0.15),
offset: const Offset(1, 2), offset: const Offset(1, 2),
blurRadius: 3, blurRadius: 3,
), ),
@ -346,7 +351,7 @@ class PaintListScreenState extends State<PaintListScreen>
BoxShadow( BoxShadow(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.15), .withValues(alpha: 0.15),
offset: const Offset(1, 2), offset: const Offset(1, 2),
blurRadius: 3, blurRadius: 3,
), ),

109
refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart
View File

@ -52,12 +52,12 @@ class MenuPersonalizeSettings extends StatelessWidget {
leading: Icon( leading: Icon(
Icons.palette_outlined, Icons.palette_outlined,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
trailing: Icon( trailing: Icon(
FeatherIcons.chevronRight, FeatherIcons.chevronRight,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
borderRadius: borderRadius, borderRadius: borderRadius,
); );
@ -175,7 +175,7 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
: s.subject.name.capital()) ?? : s.subject.name.capital()) ??
'', '',
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context).text.withValues(alpha: .95),
fontStyle: settingsProvider.renamedSubjectsItalics fontStyle: settingsProvider.renamedSubjectsItalics
? FontStyle.italic ? FontStyle.italic
: FontStyle.normal, : FontStyle.normal,
@ -187,7 +187,7 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
: s.teacher.name.capital()) ?? : s.teacher.name.capital()) ??
'', '',
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.85), color: AppColors.of(context).text.withValues(alpha: .85),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontSize: 15.0, fontSize: 15.0,
height: 1.2, height: 1.2,
@ -198,12 +198,12 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
leading: Icon( leading: Icon(
SubjectIcon.resolveVariant(context: context, subject: s.subject), SubjectIcon.resolveVariant(context: context, subject: s.subject),
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context).text.withValues(alpha: .95),
), ),
trailing: Icon( trailing: Icon(
FeatherIcons.chevronRight, FeatherIcons.chevronRight,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context).text.withValues(alpha: 0.95),
), ),
borderRadius: BorderRadius.vertical( borderRadius: BorderRadius.vertical(
top: Radius.circular(i == 0 ? 12.0 : 4.0), top: Radius.circular(i == 0 ? 12.0 : 4.0),
@ -242,7 +242,7 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
// f, // f,
// style: GoogleFonts.getFont( // style: GoogleFonts.getFont(
// f, // f,
// color: AppColors.of(context).text.withOpacity(.95), // color: AppColors.of(context).text.withValues(alpha: .95),
// fontStyle: settingsProvider.renamedSubjectsItalics // fontStyle: settingsProvider.renamedSubjectsItalics
// ? FontStyle.italic // ? FontStyle.italic
// : FontStyle.normal, // : FontStyle.normal,
@ -252,7 +252,7 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
// ? Icon( // ? Icon(
// FeatherIcons.chevronRight, // FeatherIcons.chevronRight,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity(0.95), // color: AppColors.of(context).text.withValues(alpha: 0.95),
// ) // )
// : null, // : null,
// borderRadius: BorderRadius.circular(12.0), // borderRadius: BorderRadius.circular(12.0),
@ -324,7 +324,9 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.sun, FeatherIcons.sun,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95), color: AppColors.of(context)
.text
.withValues(alpha: 0.95),
), ),
trailing: Text( trailing: Text(
themeModeText, themeModeText,
@ -354,13 +356,16 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
title: Text( title: Text(
"color".i18n, "color".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context)
.text
.withValues(alpha: .95),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.droplet, FeatherIcons.droplet,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color:
AppColors.of(context).text.withValues(alpha: .95),
), ),
trailing: Container( trailing: Container(
width: 12.0, width: 12.0,
@ -388,15 +393,15 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
title: Text( title: Text(
"new_colors".i18n, "new_colors".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.newColors ? .95 : .25), alpha: settingsProvider.newColors ? .95 : .25),
), ),
), ),
leading: Icon( leading: Icon(
Icons.flare_outlined, Icons.flare_outlined,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.newColors ? .95 : .25), alpha: settingsProvider.newColors ? .95 : .25),
), ),
trailing: Switch( trailing: Switch(
onChanged: (v) async { onChanged: (v) async {
@ -437,15 +442,16 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
title: Text( title: Text(
"shadow_effect".i18n, "shadow_effect".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.shadowEffect ? .95 : .25), alpha:
settingsProvider.shadowEffect ? .95 : .25),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.moon, FeatherIcons.moon,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.shadowEffect ? .95 : .25), alpha: settingsProvider.shadowEffect ? .95 : .25),
), ),
trailing: Switch( trailing: Switch(
onChanged: (v) async { onChanged: (v) async {
@ -480,15 +486,15 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
title: Text( title: Text(
"new_popups".i18n, "new_popups".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.newPopups ? .95 : .25), alpha: settingsProvider.newPopups ? .95 : .25),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.alertOctagon, FeatherIcons.alertOctagon,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.newPopups ? .95 : .25), alpha: settingsProvider.newPopups ? .95 : .25),
), ),
trailing: Switch( trailing: Switch(
onChanged: (v) async { onChanged: (v) async {
@ -519,13 +525,13 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
// title: Text( // title: Text(
// "icon_pack".i18n, // "icon_pack".i18n,
// style: TextStyle( // style: TextStyle(
// color: AppColors.of(context).text.withOpacity(.95), // color: AppColors.of(context).text.withValues(alpha: .95),
// ), // ),
// ), // ),
// leading: Icon( // leading: Icon(
// FeatherIcons.grid, // FeatherIcons.grid,
// size: 22.0, // size: 22.0,
// color: AppColors.of(context).text.withOpacity(.95), // color: AppColors.of(context).text.withValues(alpha: .95),
// ), // ),
// trailing: Text( // trailing: Text(
// settingsProvider.iconPack.name.capital(), // settingsProvider.iconPack.name.capital(),
@ -558,13 +564,16 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
title: Text( title: Text(
"grade_colors".i18n, "grade_colors".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context)
.text
.withValues(alpha: .95),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.star, FeatherIcons.star,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color:
AppColors.of(context).text.withValues(alpha: .95),
), ),
trailing: Row( trailing: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -616,8 +625,8 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
title: Text( title: Text(
"rename_subjects".i18n, "rename_subjects".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.renamedSubjectsEnabled alpha: settingsProvider.renamedSubjectsEnabled
? .95 ? .95
: .25), : .25),
), ),
@ -625,8 +634,8 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
leading: Icon( leading: Icon(
Icons.school_outlined, Icons.school_outlined,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.renamedSubjectsEnabled alpha: settingsProvider.renamedSubjectsEnabled
? .95 ? .95
: .25), : .25),
), ),
@ -675,8 +684,8 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
title: Text( title: Text(
"rename_teachers".i18n, "rename_teachers".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.renamedTeachersEnabled alpha: settingsProvider.renamedTeachersEnabled
? .95 ? .95
: .25), : .25),
), ),
@ -684,8 +693,8 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
leading: Icon( leading: Icon(
FeatherIcons.user, FeatherIcons.user,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.renamedTeachersEnabled alpha: settingsProvider.renamedTeachersEnabled
? .95 ? .95
: .25), : .25),
), ),
@ -729,14 +738,17 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
title: Text( title: Text(
"live_activity_color".i18n, "live_activity_color".i18n,
style: TextStyle( style: TextStyle(
color: color: AppColors.of(context)
AppColors.of(context).text.withOpacity(.95), .text
.withValues(alpha: .95),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.activity, FeatherIcons.activity,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context)
.text
.withValues(alpha: .95),
), ),
trailing: Container( trailing: Container(
margin: const EdgeInsets.only(left: 2.0), margin: const EdgeInsets.only(left: 2.0),
@ -855,7 +867,7 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
style: TextStyle( style: TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(.95), .withValues(alpha: .95),
), ),
), ),
leading: Icon( leading: Icon(
@ -863,7 +875,7 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
size: 22.0, size: 22.0,
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(.95), .withValues(alpha: .95),
), ),
borderRadius: const BorderRadius.vertical( borderRadius: const BorderRadius.vertical(
top: Radius.circular(12.0), top: Radius.circular(12.0),
@ -1022,13 +1034,16 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
title: Text( title: Text(
"font_family".i18n, "font_family".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95), color: AppColors.of(context)
.text
.withValues(alpha: .95),
), ),
), ),
leading: Icon( leading: Icon(
FeatherIcons.type, FeatherIcons.type,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity(.95), color:
AppColors.of(context).text.withValues(alpha: .95),
), ),
trailing: Text( trailing: Text(
settingsProvider.fontFamily != '' settingsProvider.fontFamily != ''
@ -1066,15 +1081,17 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
title: Text( title: Text(
"only_ch_title_font".i18n, "only_ch_title_font".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.titleOnlyFont ? .95 : .25), alpha:
settingsProvider.titleOnlyFont ? .95 : .25),
), ),
), ),
leading: Icon( leading: Icon(
Icons.text_increase_rounded, Icons.text_increase_rounded,
size: 22.0, size: 22.0,
color: AppColors.of(context).text.withOpacity( color: AppColors.of(context).text.withValues(
settingsProvider.titleOnlyFont ? .95 : .25), alpha:
settingsProvider.titleOnlyFont ? .95 : .25),
), ),
trailing: Switch( trailing: Switch(
onChanged: (v) async { onChanged: (v) async {

9
refilc_mobile_ui/lib/screens/settings/theme_screen.dart
View File

@ -271,9 +271,12 @@ class _PremiumCustomAccentColorSettingState
stops: const [0.0, 0.75], stops: const [0.0, 0.75],
colors: isBackgroundDifferent colors: isBackgroundDifferent
? [ ? [
Theme.of(context).colorScheme.surface.withOpacity(1 - Theme.of(context).colorScheme.surface.withValues(
((currentTheme == ThemeMode.dark ? 0.65 : 0.25) * alpha: 1 -
backgroundAnimation.value)), ((currentTheme == ThemeMode.dark
? 0.65
: 0.25) *
backgroundAnimation.value)),
backgroundGradientBottomColor, backgroundGradientBottomColor,
] ]
: [ : [

8
refilc_mobile_ui/lib/screens/summary/pages/grades_page.dart
View File

@ -112,7 +112,7 @@ class GradesBodyState extends State<GradesBody> {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 20.0, fontSize: 20.0,
color: Colors.white.withOpacity(0.98), color: Colors.white.withValues(alpha: 0.98),
fontStyle: settings.renamedSubjectsItalics && subject.isRenamed fontStyle: settings.renamedSubjectsItalics && subject.isRenamed
? FontStyle.italic ? FontStyle.italic
: null, : null,
@ -145,7 +145,7 @@ class GradesBodyState extends State<GradesBody> {
style: TextStyle( style: TextStyle(
fontSize: 18.0, fontSize: 18.0,
height: 2.0, height: 2.0,
color: Colors.white.withOpacity(0.5)), color: Colors.white.withValues(alpha: 0.5)),
), ),
], ],
), ),
@ -331,10 +331,10 @@ class GradesBodyState extends State<GradesBody> {
horizontal: 16.0, vertical: 4.0), horizontal: 16.0, vertical: 4.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: gradeColor(context: context, value: endYearAvg) color: gradeColor(context: context, value: endYearAvg)
.withOpacity(.2), .withValues(alpha: .2),
border: Border.all( border: Border.all(
color: (gradeColor(context: context, value: endYearAvg)) color: (gradeColor(context: context, value: endYearAvg))
.withOpacity(0.0), .withValues(alpha: 0.0),
width: 2.0, width: 2.0,
), ),
borderRadius: BorderRadius.circular(45.0), borderRadius: BorderRadius.circular(45.0),

2
refilc_mobile_ui/lib/screens/summary/pages/lessons_page.dart
View File

@ -310,7 +310,7 @@ class LessonsBodyState extends State<LessonsBody> {
style: TextStyle( style: TextStyle(
fontSize: 18.0, fontSize: 18.0,
height: 2.0, height: 2.0,
color: Colors.white.withOpacity(0.5)), color: Colors.white.withValues(alpha: 0.5)),
), ),
], ],
), ),

4
refilc_mobile_ui/lib/screens/summary/pages/personality_page.dart
View File

@ -98,7 +98,7 @@ class PersonalityBodyState extends State<PersonalityBody> {
), ),
style: ButtonStyle( style: ButtonStyle(
backgroundColor: WidgetStateProperty.all( backgroundColor: WidgetStateProperty.all(
Colors.white.withOpacity(0.2)), Colors.white.withValues(alpha: 0.2)),
), ),
), ),
const SizedBox( const SizedBox(
@ -115,7 +115,7 @@ class PersonalityBodyState extends State<PersonalityBody> {
), ),
style: ButtonStyle( style: ButtonStyle(
backgroundColor: WidgetStateProperty.all( backgroundColor: WidgetStateProperty.all(
Colors.white.withOpacity(0.2)), Colors.white.withValues(alpha: 0.2)),
), ),
), ),
], ],

Some files were not shown because too many files have changed in this diff Show More