removed unused code and files
This commit is contained in:
parent
43471fcf3d
commit
328c4f410c
@ -4,7 +4,6 @@ import 'package:json_annotation/json_annotation.dart';
|
|||||||
import '../devTools/devToolsSettings.dart';
|
import '../devTools/devToolsSettings.dart';
|
||||||
import '../file/fileSettings.dart';
|
import '../file/fileSettings.dart';
|
||||||
import '../fileView/fileViewSettings.dart';
|
import '../fileView/fileViewSettings.dart';
|
||||||
import '../gradeAverages/gradeAveragesSettings.dart';
|
|
||||||
import '../holidays/holidaysSettings.dart';
|
import '../holidays/holidaysSettings.dart';
|
||||||
import '../notification/notificationSettings.dart';
|
import '../notification/notificationSettings.dart';
|
||||||
import '../talk/talkSettings.dart';
|
import '../talk/talkSettings.dart';
|
||||||
@ -21,7 +20,6 @@ class Settings {
|
|||||||
ThemeMode appTheme;
|
ThemeMode appTheme;
|
||||||
bool devToolsEnabled;
|
bool devToolsEnabled;
|
||||||
|
|
||||||
GradeAveragesSettings gradeAveragesSettings;
|
|
||||||
TimetableSettings timetableSettings;
|
TimetableSettings timetableSettings;
|
||||||
TalkSettings talkSettings;
|
TalkSettings talkSettings;
|
||||||
FileSettings fileSettings;
|
FileSettings fileSettings;
|
||||||
@ -33,7 +31,6 @@ class Settings {
|
|||||||
Settings({
|
Settings({
|
||||||
required this.appTheme,
|
required this.appTheme,
|
||||||
required this.devToolsEnabled,
|
required this.devToolsEnabled,
|
||||||
required this.gradeAveragesSettings,
|
|
||||||
required this.timetableSettings,
|
required this.timetableSettings,
|
||||||
required this.talkSettings,
|
required this.talkSettings,
|
||||||
required this.fileSettings,
|
required this.fileSettings,
|
||||||
|
@ -9,8 +9,6 @@ part of 'settings.dart';
|
|||||||
Settings _$SettingsFromJson(Map<String, dynamic> json) => Settings(
|
Settings _$SettingsFromJson(Map<String, dynamic> json) => Settings(
|
||||||
appTheme: Settings._themeFromJson(json['appTheme'] as String),
|
appTheme: Settings._themeFromJson(json['appTheme'] as String),
|
||||||
devToolsEnabled: json['devToolsEnabled'] as bool,
|
devToolsEnabled: json['devToolsEnabled'] as bool,
|
||||||
gradeAveragesSettings: GradeAveragesSettings.fromJson(
|
|
||||||
json['gradeAveragesSettings'] as Map<String, dynamic>),
|
|
||||||
timetableSettings: TimetableSettings.fromJson(
|
timetableSettings: TimetableSettings.fromJson(
|
||||||
json['timetableSettings'] as Map<String, dynamic>),
|
json['timetableSettings'] as Map<String, dynamic>),
|
||||||
talkSettings:
|
talkSettings:
|
||||||
@ -30,7 +28,6 @@ Settings _$SettingsFromJson(Map<String, dynamic> json) => Settings(
|
|||||||
Map<String, dynamic> _$SettingsToJson(Settings instance) => <String, dynamic>{
|
Map<String, dynamic> _$SettingsToJson(Settings instance) => <String, dynamic>{
|
||||||
'appTheme': Settings._themeToJson(instance.appTheme),
|
'appTheme': Settings._themeToJson(instance.appTheme),
|
||||||
'devToolsEnabled': instance.devToolsEnabled,
|
'devToolsEnabled': instance.devToolsEnabled,
|
||||||
'gradeAveragesSettings': instance.gradeAveragesSettings.toJson(),
|
|
||||||
'timetableSettings': instance.timetableSettings.toJson(),
|
'timetableSettings': instance.timetableSettings.toJson(),
|
||||||
'talkSettings': instance.talkSettings.toJson(),
|
'talkSettings': instance.talkSettings.toJson(),
|
||||||
'fileSettings': instance.fileSettings.toJson(),
|
'fileSettings': instance.fileSettings.toJson(),
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
|
|
||||||
import 'package:json_annotation/json_annotation.dart';
|
|
||||||
|
|
||||||
part 'gradeAveragesSettings.g.dart';
|
|
||||||
|
|
||||||
@JsonSerializable()
|
|
||||||
class GradeAveragesSettings {
|
|
||||||
bool useGradeSystem;
|
|
||||||
bool askedForPreferredGradeSystem;
|
|
||||||
List<int> inputs;
|
|
||||||
|
|
||||||
GradeAveragesSettings({required this.useGradeSystem, required this.askedForPreferredGradeSystem, required this.inputs});
|
|
||||||
|
|
||||||
factory GradeAveragesSettings.fromJson(Map<String, dynamic> json) => _$GradeAveragesSettingsFromJson(json);
|
|
||||||
Map<String, dynamic> toJson() => _$GradeAveragesSettingsToJson(this);
|
|
||||||
}
|
|
@ -1,24 +0,0 @@
|
|||||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
|
||||||
|
|
||||||
part of 'gradeAveragesSettings.dart';
|
|
||||||
|
|
||||||
// **************************************************************************
|
|
||||||
// JsonSerializableGenerator
|
|
||||||
// **************************************************************************
|
|
||||||
|
|
||||||
GradeAveragesSettings _$GradeAveragesSettingsFromJson(
|
|
||||||
Map<String, dynamic> json) =>
|
|
||||||
GradeAveragesSettings(
|
|
||||||
useGradeSystem: json['useGradeSystem'] as bool,
|
|
||||||
askedForPreferredGradeSystem:
|
|
||||||
json['askedForPreferredGradeSystem'] as bool,
|
|
||||||
inputs: (json['inputs'] as List<dynamic>).map((e) => e as int).toList(),
|
|
||||||
);
|
|
||||||
|
|
||||||
Map<String, dynamic> _$GradeAveragesSettingsToJson(
|
|
||||||
GradeAveragesSettings instance) =>
|
|
||||||
<String, dynamic>{
|
|
||||||
'useGradeSystem': instance.useGradeSystem,
|
|
||||||
'askedForPreferredGradeSystem': instance.askedForPreferredGradeSystem,
|
|
||||||
'inputs': instance.inputs,
|
|
||||||
};
|
|
@ -1,211 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:provider/provider.dart';
|
|
||||||
|
|
||||||
import '../../../../storage/base/settingsProvider.dart';
|
|
||||||
import '../../../../widget/confirmDialog.dart';
|
|
||||||
|
|
||||||
class GradeAverage extends StatefulWidget {
|
|
||||||
const GradeAverage({super.key});
|
|
||||||
|
|
||||||
@override
|
|
||||||
State<GradeAverage> createState() => _GradeAverageState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _GradeAverageState extends State<GradeAverage> {
|
|
||||||
double average = 0;
|
|
||||||
bool gradeSystem = true;
|
|
||||||
List<int> grades = List.empty(growable: true);
|
|
||||||
|
|
||||||
late SettingsProvider settings = Provider.of<SettingsProvider>(context, listen: false);
|
|
||||||
|
|
||||||
void _persistGrades() {
|
|
||||||
settings.val(write: true).gradeAveragesSettings.inputs = grades;
|
|
||||||
}
|
|
||||||
|
|
||||||
String getGradeDisplay(int grade) {
|
|
||||||
if(gradeSystem) {
|
|
||||||
return 'Note $grade';
|
|
||||||
} else {
|
|
||||||
return "$grade Punkt${grade > 1 ? "e" : ""}";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void switchSystem(bool e) => setState(() {
|
|
||||||
grades.clear();
|
|
||||||
gradeSystem = e;
|
|
||||||
settings.val(write: true).gradeAveragesSettings.useGradeSystem = e;
|
|
||||||
_persistGrades();
|
|
||||||
});
|
|
||||||
|
|
||||||
@override
|
|
||||||
void initState() {
|
|
||||||
super.initState();
|
|
||||||
|
|
||||||
grades = settings.val().gradeAveragesSettings.inputs;
|
|
||||||
gradeSystem = settings.val().gradeAveragesSettings.useGradeSystem;
|
|
||||||
|
|
||||||
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
|
|
||||||
if(!settings.val().gradeAveragesSettings.askedForPreferredGradeSystem) {
|
|
||||||
settings.val(write: true).gradeAveragesSettings.askedForPreferredGradeSystem = true;
|
|
||||||
showDialog(context: context, builder: (context) => AlertDialog(
|
|
||||||
title: const Text('Notensystem'),
|
|
||||||
content: const Text('Wähle dein bevorzugtes Schulnotensystem'),
|
|
||||||
actions: [
|
|
||||||
TextButton(
|
|
||||||
onPressed: () {
|
|
||||||
switchSystem(true);
|
|
||||||
Navigator.of(context).pop();
|
|
||||||
},
|
|
||||||
child: const Text('Realschule'),
|
|
||||||
),
|
|
||||||
TextButton(
|
|
||||||
onPressed: () {
|
|
||||||
switchSystem(false);
|
|
||||||
Navigator.of(context).pop();
|
|
||||||
},
|
|
||||||
child: const Text('Oberstufe'),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
if(grades.isNotEmpty) {
|
|
||||||
average = grades.reduce((a, b) => a + b) / grades.length;
|
|
||||||
} else {
|
|
||||||
average = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Scaffold(
|
|
||||||
appBar: AppBar(
|
|
||||||
title: const Text('Notendurschnittsrechner'),
|
|
||||||
actions: [
|
|
||||||
Visibility(
|
|
||||||
visible: grades.isNotEmpty,
|
|
||||||
child: IconButton(onPressed: () {
|
|
||||||
showDialog(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => ConfirmDialog(
|
|
||||||
title: 'Zurücksetzen?',
|
|
||||||
content: 'Alle Einträge werden entfernt.',
|
|
||||||
confirmButton: 'Zurücksetzen',
|
|
||||||
onConfirm: () {
|
|
||||||
grades.clear();
|
|
||||||
setState(() {});
|
|
||||||
},
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}, icon: const Icon(Icons.delete_forever)),
|
|
||||||
),
|
|
||||||
PopupMenuButton<bool>(
|
|
||||||
initialValue: gradeSystem,
|
|
||||||
icon: const Icon(Icons.more_horiz),
|
|
||||||
itemBuilder: (context) => [true, false].map((e) => PopupMenuItem<bool>(
|
|
||||||
value: e,
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
Icon(e ? Icons.calculate_outlined : Icons.school_outlined, color: Theme.of(context).colorScheme.onSurface),
|
|
||||||
const SizedBox(width: 15),
|
|
||||||
Text(e ? 'Notensystem' : 'Punktesystem'),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
)).toList(),
|
|
||||||
|
|
||||||
onSelected: (e) {
|
|
||||||
|
|
||||||
if(grades.isNotEmpty) {
|
|
||||||
showDialog(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => ConfirmDialog(
|
|
||||||
title: 'Notensystem wechseln',
|
|
||||||
content: 'Beim wechsel des Notensystems werden alle Einträge zurückgesetzt.',
|
|
||||||
confirmButton: 'Fortfahren',
|
|
||||||
onConfirm: () => switchSystem(e),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
switchSystem(e);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
body: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
|
||||||
children: [
|
|
||||||
const SizedBox(height: 30),
|
|
||||||
Text(average.toStringAsFixed(2), style: const TextStyle(fontSize: 30, fontWeight: FontWeight.bold)),
|
|
||||||
const SizedBox(height: 10),
|
|
||||||
const Divider(),
|
|
||||||
const SizedBox(height: 10),
|
|
||||||
Text(gradeSystem ? 'Wähle unten die Anzahl deiner jewiligen Noten aus' : 'Wähle unten die Anzahl deiner jeweiligen Punkte aus'),
|
|
||||||
const SizedBox(height: 10),
|
|
||||||
Expanded(
|
|
||||||
child: ListView.builder(
|
|
||||||
itemBuilder: (context, index) {
|
|
||||||
var grade = gradeSystem ? index + 1 : 15 - index;
|
|
||||||
bool isThis(int e) => e == grade;
|
|
||||||
return Material(
|
|
||||||
child: ListTile(
|
|
||||||
tileColor: grade.isEven ? Colors.transparent : Colors.transparent.withAlpha(50),
|
|
||||||
title: Center(
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
|
||||||
children: [
|
|
||||||
Text(getGradeDisplay(grade)),
|
|
||||||
const SizedBox(width: 30),
|
|
||||||
IconButton(
|
|
||||||
onPressed: () {
|
|
||||||
setState(() {
|
|
||||||
if(!grades.any(isThis)) return;
|
|
||||||
grades.removeAt(grades.indexWhere(isThis));
|
|
||||||
_persistGrades();
|
|
||||||
});
|
|
||||||
},
|
|
||||||
icon: const Icon(Icons.remove),
|
|
||||||
color: Theme.of(context).colorScheme.onSurface,
|
|
||||||
),
|
|
||||||
Text('${grades.where(isThis).length}', style: const TextStyle(fontSize: 15, fontWeight: FontWeight.bold)),
|
|
||||||
IconButton(
|
|
||||||
onPressed: () {
|
|
||||||
setState(() {
|
|
||||||
grades.add(grade);
|
|
||||||
_persistGrades();
|
|
||||||
});
|
|
||||||
},
|
|
||||||
icon: const Icon(Icons.add),
|
|
||||||
color: Theme.of(context).colorScheme.onSurface,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
trailing: Visibility(
|
|
||||||
maintainState: true,
|
|
||||||
maintainAnimation: true,
|
|
||||||
maintainSize: true,
|
|
||||||
visible: grades.any(isThis),
|
|
||||||
child: IconButton(
|
|
||||||
icon: const Icon(Icons.delete),
|
|
||||||
onPressed: () {
|
|
||||||
setState(() {
|
|
||||||
grades.removeWhere(isThis);
|
|
||||||
_persistGrades();
|
|
||||||
});
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
itemCount: gradeSystem ? 6 : 16,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
@ -6,7 +6,6 @@ import '../../storage/base/settings.dart';
|
|||||||
import '../../storage/devTools/devToolsSettings.dart';
|
import '../../storage/devTools/devToolsSettings.dart';
|
||||||
import '../../storage/file/fileSettings.dart';
|
import '../../storage/file/fileSettings.dart';
|
||||||
import '../../storage/fileView/fileViewSettings.dart';
|
import '../../storage/fileView/fileViewSettings.dart';
|
||||||
import '../../storage/gradeAverages/gradeAveragesSettings.dart';
|
|
||||||
import '../../storage/holidays/holidaysSettings.dart';
|
import '../../storage/holidays/holidaysSettings.dart';
|
||||||
import '../../storage/notification/notificationSettings.dart';
|
import '../../storage/notification/notificationSettings.dart';
|
||||||
import '../../storage/talk/talkSettings.dart';
|
import '../../storage/talk/talkSettings.dart';
|
||||||
@ -17,11 +16,6 @@ class DefaultSettings {
|
|||||||
static Settings get() => Settings(
|
static Settings get() => Settings(
|
||||||
appTheme: ThemeMode.system,
|
appTheme: ThemeMode.system,
|
||||||
devToolsEnabled: false,
|
devToolsEnabled: false,
|
||||||
gradeAveragesSettings: GradeAveragesSettings(
|
|
||||||
useGradeSystem: true,
|
|
||||||
askedForPreferredGradeSystem: false,
|
|
||||||
inputs: []
|
|
||||||
),
|
|
||||||
timetableSettings: TimetableSettings(
|
timetableSettings: TimetableSettings(
|
||||||
connectDoubleLessons: false,
|
connectDoubleLessons: false,
|
||||||
),
|
),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user