balint14/student-legacy
balint14/student-legacy
1
Fork 0
forked from firka/student-legacy
Code Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
filcnaplo_mobile_ui/lib/premium/components/plan_card.dart
View File

@ -42,7 +42,8 @@ class PlusPlanCard extends StatelessWidget {
borderRadius: borderRadius!, borderRadius: borderRadius!,
), ),
shadowColor: Colors.transparent, shadowColor: Colors.transparent,
surfaceTintColor: Theme.of(context).colorScheme.background, surfaceTintColor: Colors.white,
color: Colors.white,
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),

47
filcnaplo_mobile_ui/lib/premium/plus_screen.dart
View File

@ -19,6 +19,7 @@ class PlusScreen extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: const Color(0xffF4F9FF),
body: Container( body: Container(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
width: double.infinity, width: double.infinity,
@ -33,11 +34,11 @@ class PlusScreen extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context).scaffoldBackgroundColor.withOpacity(0.1), const Color(0xffF4F9FF).withOpacity(0.1),
Theme.of(context).scaffoldBackgroundColor.withOpacity(0.15), const Color(0xffF4F9FF).withOpacity(0.15),
Theme.of(context).scaffoldBackgroundColor.withOpacity(0.25), const Color(0xffF4F9FF).withOpacity(0.25),
Theme.of(context).scaffoldBackgroundColor.withOpacity(0.4), const Color(0xffF4F9FF).withOpacity(0.4),
Theme.of(context).scaffoldBackgroundColor.withOpacity(0.5), const Color(0xffF4F9FF).withOpacity(0.5),
], ],
begin: Alignment.topCenter, begin: Alignment.topCenter,
end: Alignment.bottomCenter, end: Alignment.bottomCenter,
@ -50,19 +51,11 @@ class PlusScreen extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context) const Color(0xffF4F9FF).withOpacity(0.0),
.scaffoldBackgroundColor const Color(0xffF4F9FF).withOpacity(0.4),
.withOpacity(0.0), const Color(0xffF4F9FF).withOpacity(0.6),
Theme.of(context) const Color(0xffF4F9FF).withOpacity(0.9),
.scaffoldBackgroundColor const Color(0xffF4F9FF),
.withOpacity(0.4),
Theme.of(context)
.scaffoldBackgroundColor
.withOpacity(0.6),
Theme.of(context)
.scaffoldBackgroundColor
.withOpacity(0.9),
Theme.of(context).scaffoldBackgroundColor,
], ],
begin: Alignment.topCenter, begin: Alignment.topCenter,
end: Alignment.bottomCenter, end: Alignment.bottomCenter,
@ -272,8 +265,8 @@ class PlusScreen extends StatelessWidget {
), ),
), ),
shadowColor: Colors.transparent, shadowColor: Colors.transparent,
surfaceTintColor: surfaceTintColor: const Color(0xffFFFFFF),
Theme.of(context).colorScheme.background, color: Colors.white,
child: Padding( child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
top: 18.0, top: 18.0,
@ -289,6 +282,7 @@ class PlusScreen extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 16.6, fontSize: 16.6,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.black,
), ),
), ),
const SizedBox( const SizedBox(
@ -343,8 +337,8 @@ class PlusScreen extends StatelessWidget {
), ),
), ),
shadowColor: Colors.transparent, shadowColor: Colors.transparent,
surfaceTintColor: surfaceTintColor: const Color(0xffFFFFFF),
Theme.of(context).colorScheme.background, color: Colors.white,
child: Padding( child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
top: 18.0, top: 18.0,
@ -360,6 +354,7 @@ class PlusScreen extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 16.6, fontSize: 16.6,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.black,
), ),
), ),
const SizedBox( const SizedBox(
@ -402,8 +397,8 @@ class PlusScreen extends StatelessWidget {
), ),
), ),
shadowColor: Colors.transparent, shadowColor: Colors.transparent,
surfaceTintColor: surfaceTintColor: const Color(0xffFFFFFF),
Theme.of(context).colorScheme.background, color: Colors.white,
child: Padding( child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
top: 18.0, top: 18.0,
@ -444,6 +439,7 @@ class PlusScreen extends StatelessWidget {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 14.4, fontSize: 14.4,
height: 1.3, height: 1.3,
color: Colors.black,
), ),
), ),
), ),
@ -482,6 +478,7 @@ class PlusScreen extends StatelessWidget {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 14.4, fontSize: 14.4,
height: 1.3, height: 1.3,
color: Colors.black,
), ),
), ),
), ),
@ -520,6 +517,7 @@ class PlusScreen extends StatelessWidget {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 14.4, fontSize: 14.4,
height: 1.3, height: 1.3,
color: Colors.black,
), ),
), ),
), ),
@ -558,6 +556,7 @@ class PlusScreen extends StatelessWidget {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 14.4, fontSize: 14.4,
height: 1.3, height: 1.3,
color: Colors.black,
), ),
), ),
), ),

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 // Rounding modal

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

@ -241,16 +241,19 @@ class SettingsScreenState extends State<SettingsScreen>
Row( Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
IconButton( // IconButton(
splashRadius: 32.0, // splashRadius: 32.0,
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.withOpacity(0.8)),
), // ),
// const SizedBox( // const SizedBox(
// width: 5, // width: 5,
// ), // ),
const SizedBox(
width: 5.0,
),
IconButton( IconButton(
splashRadius: 32.0, splashRadius: 32.0,
// onPressed: () async => await databaseProvider.userStore // onPressed: () async => await databaseProvider.userStore
@ -266,13 +269,21 @@ class SettingsScreenState extends State<SettingsScreen>
), ),
], ],
), ),
IconButton( Row(
splashRadius: 26.0, mainAxisAlignment: MainAxisAlignment.end,
onPressed: () { children: [
Navigator.of(context).pop(); IconButton(
}, splashRadius: 26.0,
icon: Icon(FeatherIcons.x, onPressed: () {
color: AppColors.of(context).text.withOpacity(0.8)), 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/theme/colors/colors.dart';
import 'package:filcnaplo_mobile_ui/common/panel/panel_button.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/common/splitted_panel/splitted_panel.dart';
import 'package:filcnaplo_mobile_ui/screens/settings/settings_helper.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart';
@ -81,11 +82,12 @@ class ExtrasSettingsScreenState extends State<ExtrasSettingsScreen> {
PanelButton( PanelButton(
padding: const EdgeInsets.only(left: 14.0, right: 6.0), padding: const EdgeInsets.only(left: 14.0, right: 6.0),
onPressed: () async { onPressed: () async {
settingsProvider.update( // settingsProvider.update(
gradeOpeningFun: !settingsProvider.gradeOpeningFun); // gradeOpeningFun: !settingsProvider.gradeOpeningFun);
SettingsHelper.surpriseGradeRarityText(context);
setState(() {}); setState(() {});
}, },
trailingDivider: true,
title: Text( title: Text(
"surprise_grades".i18n, "surprise_grades".i18n,
style: TextStyle( style: TextStyle(