updated new linter rules

This commit is contained in:
Elias Müller 2024-03-29 18:47:54 +01:00
parent 5b34afd6cb
commit eaf6d9f547
8 changed files with 38 additions and 38 deletions

View File

@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:marianum_mobile/view/pages/more/abiturCalculator/models/abiturCalculatorModel.dart';
import 'package:marianum_mobile/view/pages/more/abiturCalculator/models/subject.dart';
import 'package:marianum_mobile/view/pages/more/abiturCalculator/steps/resultStep.dart';
import 'package:marianum_mobile/view/pages/more/abiturCalculator/steps/selectGkStep.dart';
import 'package:marianum_mobile/view/pages/more/abiturCalculator/steps/selectLkStep.dart';
import 'package:marianum_mobile/view/pages/more/abiturCalculator/steps/selectPfStep.dart';
import 'package:marianum_mobile/view/pages/more/abiturCalculator/steps/welcomeStep.dart';
import 'models/abiturCalculatorModel.dart';
import 'models/subject.dart';
import 'steps/resultStep.dart';
import 'steps/selectGkStep.dart';
import 'steps/selectLkStep.dart';
import 'steps/selectPfStep.dart';
import 'steps/welcomeStep.dart';
import 'package:provider/provider.dart';
class AbiturCalculatorView extends StatelessWidget {
@ -32,7 +32,7 @@ class AbiturCalculatorView extends StatelessWidget {
return Consumer<AbiturCalculatorModel>(builder: (context, state, child) {
return Scaffold(
appBar: AppBar(
title: const Text("Abitur Notenrechner"),
title: const Text('Abitur Notenrechner'),
),
body: Stepper(
type: StepperType.vertical,
@ -40,7 +40,7 @@ class AbiturCalculatorView extends StatelessWidget {
const WelcomeStep(),
SelectLkStep(),
SelectGkStep(),
SelectPfStep(),
const SelectPfStep(),
const ResultStep(),
],
currentStep: state.getStep,

View File

@ -5,24 +5,24 @@ import 'subject.dart';
class AbiturCalculatorModel extends ChangeNotifier {
static SubjectCollection subjects = SubjectCollection([
Subject(displayName: "Deutsch", icon: Icons.translate_outlined, lkApplicable: true),
Subject(displayName: "Erste Fremdsprache", icon: Icons.translate_outlined, lkApplicable: true),
Subject(displayName: "Zweite Fremdsprache", icon: Icons.translate_outlined, lkApplicable: true),
Subject(displayName: "Zweite Fremdsprache ab Kl. 11", icon: Icons.translate_outlined, lkApplicable: false),
Subject(displayName: "Kunst", icon: Icons.brush_outlined, lkApplicable: true),
Subject(displayName: "Musik", icon: Icons.music_note_outlined, lkApplicable: true),
Subject(displayName: "Darstellendes Spiel", icon: Icons.theater_comedy_outlined, lkApplicable: false),
Subject(displayName: "PoWi", icon: Icons.book_outlined, lkApplicable: true),
Subject(displayName: "Geschichte", icon: Icons.history_outlined, lkApplicable: true),
Subject(displayName: "Religion", icon: Icons.church_outlined, lkApplicable: true),
Subject(displayName: "Erdkunde", icon: Icons.map_outlined, lkApplicable: true),
Subject(displayName: "Mathematik", icon: Icons.calculate_outlined, lkApplicable: true),
Subject(displayName: "Erste Naturwissenschaft", icon: Icons.science_outlined, lkApplicable: true),
Subject(displayName: "Zweite Naturwissenschaft", icon: Icons.science_outlined, lkApplicable: true),
Subject(displayName: "Dritte Naturwissenschaft", icon: Icons.science_outlined, lkApplicable: true),
Subject(displayName: "Biochemie", icon: Icons.biotech_outlined, lkApplicable: false),
Subject(displayName: "Informatik", icon: Icons.code_outlined, lkApplicable: true),
Subject(displayName: "Sport", icon: Icons.sports_basketball_outlined, lkApplicable: true),
Subject(displayName: 'Deutsch', icon: Icons.translate_outlined, lkApplicable: true),
Subject(displayName: 'Erste Fremdsprache', icon: Icons.translate_outlined, lkApplicable: true),
Subject(displayName: 'Zweite Fremdsprache', icon: Icons.translate_outlined, lkApplicable: true),
Subject(displayName: 'Zweite Fremdsprache ab Kl. 11', icon: Icons.translate_outlined, lkApplicable: false),
Subject(displayName: 'Kunst', icon: Icons.brush_outlined, lkApplicable: true),
Subject(displayName: 'Musik', icon: Icons.music_note_outlined, lkApplicable: true),
Subject(displayName: 'Darstellendes Spiel', icon: Icons.theater_comedy_outlined, lkApplicable: false),
Subject(displayName: 'PoWi', icon: Icons.book_outlined, lkApplicable: true),
Subject(displayName: 'Geschichte', icon: Icons.history_outlined, lkApplicable: true),
Subject(displayName: 'Religion', icon: Icons.church_outlined, lkApplicable: true),
Subject(displayName: 'Erdkunde', icon: Icons.map_outlined, lkApplicable: true),
Subject(displayName: 'Mathematik', icon: Icons.calculate_outlined, lkApplicable: true),
Subject(displayName: 'Erste Naturwissenschaft', icon: Icons.science_outlined, lkApplicable: true),
Subject(displayName: 'Zweite Naturwissenschaft', icon: Icons.science_outlined, lkApplicable: true),
Subject(displayName: 'Dritte Naturwissenschaft', icon: Icons.science_outlined, lkApplicable: true),
Subject(displayName: 'Biochemie', icon: Icons.biotech_outlined, lkApplicable: false),
Subject(displayName: 'Informatik', icon: Icons.code_outlined, lkApplicable: true),
Subject(displayName: 'Sport', icon: Icons.sports_basketball_outlined, lkApplicable: true),
]);
static AbiturCalculatorModel get(BuildContext context) {

View File

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
class ResultStep extends Step {
const ResultStep() : super(
title: const Text("Ergebnis"),
title: const Text('Ergebnis'),
content: const SizedBox.shrink(),
);
}

View File

@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:marianum_mobile/view/pages/more/abiturCalculator/abiturCalculatorView.dart';
import '../abiturCalculatorView.dart';
import '../models/abiturCalculatorModel.dart';
class SelectGkStep extends Step {
SelectGkStep() : super(
title: const Text("Grundkurse"),
title: const Text('Grundkurse'),
content: Builder(builder: (context) {
var gkSubjects = AbiturCalculatorModel.get(context).getSubjects.collection.where((e) => e.isGk()).toList();
return Column(

View File

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:marianum_mobile/widget/providerBridge.dart';
import '../../../../../widget/providerBridge.dart';
import '../../../../../widget/centeredLeading.dart';
import '../abiturCalculatorView.dart';
@ -7,7 +7,7 @@ import '../models/abiturCalculatorModel.dart';
class SelectLkStep extends Step {
SelectLkStep() : super(
title: const Text("Leistungskurse"),
title: const Text('Leistungskurse'),
content: StatefulBuilder(builder: (context, setState) {
var model = AbiturCalculatorModel.get(context);
var lkSubjects = model.getSubjects.collection.where((e) => e.isLk()).toList();
@ -18,7 +18,7 @@ class SelectLkStep extends Step {
onPressed: () {
ProviderBridge.toDialog(context, model, (context, value) {
return AlertDialog(
title: const Text("Leistungskurse"),
title: const Text('Leistungskurse'),
content: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
@ -43,7 +43,7 @@ class SelectLkStep extends Step {
onPressed: () {
Navigator.of(context).pop();
},
child: const Text("Fertig"),
child: const Text('Fertig'),
)
],
);

View File

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
class SelectPfStep extends Step {
const SelectPfStep() : super(
title: const Text("Prüfungsfächer"),
title: const Text('Prüfungsfächer'),
content: const SizedBox.shrink(),
);
}

View File

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
class WelcomeStep extends Step {
const WelcomeStep() : super(
title: const Text("Willkommen"),
content: const Text("In den folgenden Schritten werden alle nötigen Informationen zur Ermittlung deiner Abiturzulassung abgefragt.")
title: const Text('Willkommen'),
content: const Text('In den folgenden Schritten werden alle nötigen Informationen zur Ermittlung deiner Abiturzulassung abgefragt.')
);
}

View File

@ -36,7 +36,7 @@ class Overhang extends StatelessWidget {
const ListItemNavigator(icon: Icons.newspaper, text: 'Marianum Message', target: Message()),
const ListItemNavigator(icon: Icons.room, text: 'Raumplan', target: Roomplan()),
const ListItemNavigator(icon: Icons.calculate, text: 'Notendurschnittsrechner', target: GradeAverage()),
const ListItemNavigator(icon: Icons.school_outlined, text: "Abiturrechner", target: AbiturCalculatorView()),
const ListItemNavigator(icon: Icons.school_outlined, text: 'Abiturrechner', target: AbiturCalculatorView()),
const ListItemNavigator(icon: Icons.calendar_month, text: 'Schulferien', target: Holidays()),
const Divider(),
ListTile(