devbeni/student-legacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rfp and v5 fixes

Browse Source
This commit is contained in:
Kima
2024-02-09 23:37:35 +01:00
parent dee6a13b1c
commit 4b2b90be8e
5 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
filcnaplo_mobile_ui/lib/screens/settings/settings_helper.dart
View File

@@ -385,6 +385,14 @@ class SettingsHelper {
}),
);
}
// v5 grade rarity texts
static void surpriseGradeRarityText(BuildContext context) {
showRoundedModalBottomSheet(
context,
child: const GradeColorsSetting(),
);
}
}
// Rounding modal

39
filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart
View File

@@ -241,16 +241,19 @@ class SettingsScreenState extends State<SettingsScreen>
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
IconButton(
splashRadius: 32.0,
onPressed: () =>
_showBottomSheet(user.getUser(user.id ?? "")),
icon: Icon(FeatherIcons.moreVertical,
color: AppColors.of(context).text.withOpacity(0.8)),
),
// IconButton(
// splashRadius: 32.0,
// onPressed: () =>
// _showBottomSheet(user.getUser(user.id ?? "")),
// icon: Icon(FeatherIcons.moreVertical,
// color: AppColors.of(context).text.withOpacity(0.8)),
// ),
// const SizedBox(
// width: 5,
// ),
const SizedBox(
width: 5.0,
),
IconButton(
splashRadius: 32.0,
// onPressed: () async => await databaseProvider.userStore
@@ -266,13 +269,21 @@ class SettingsScreenState extends State<SettingsScreen>
),
],
),
IconButton(
splashRadius: 26.0,
onPressed: () {
Navigator.of(context).pop();
},
icon: Icon(FeatherIcons.x,
color: AppColors.of(context).text.withOpacity(0.8)),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
IconButton(
splashRadius: 26.0,
onPressed: () {
Navigator.of(context).pop();
},
icon: Icon(FeatherIcons.x,
color: AppColors.of(context).text.withOpacity(0.8)),
),
const SizedBox(
width: 5.0,
),
],
),
],
),

8
filcnaplo_mobile_ui/lib/screens/settings/submenu/extras_screen.dart
View File

@@ -4,6 +4,7 @@ import 'package:filcnaplo/models/settings.dart';
import 'package:filcnaplo/theme/colors/colors.dart';
import 'package:filcnaplo_mobile_ui/common/panel/panel_button.dart';
import 'package:filcnaplo_mobile_ui/common/splitted_panel/splitted_panel.dart';
import 'package:filcnaplo_mobile_ui/screens/settings/settings_helper.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
@@ -81,11 +82,12 @@ class ExtrasSettingsScreenState extends State<ExtrasSettingsScreen> {
PanelButton(
padding: const EdgeInsets.only(left: 14.0, right: 6.0),
onPressed: () async {
settingsProvider.update(
gradeOpeningFun: !settingsProvider.gradeOpeningFun);
// settingsProvider.update(
// gradeOpeningFun: !settingsProvider.gradeOpeningFun);
SettingsHelper.surpriseGradeRarityText(context);
setState(() {});
},
trailingDivider: true,
title: Text(
"surprise_grades".i18n,
style: TextStyle(