From 4b2b90be8e1030cde02ac2d0c20b72935b8ac9bc Mon Sep 17 00:00:00 2001 From: Kima Date: Fri, 9 Feb 2024 23:37:35 +0100 Subject: [PATCH] rfp and v5 fixes --- .../lib/premium/components/plan_card.dart | 3 +- .../lib/premium/plus_screen.dart | 47 +++++++++---------- .../lib/screens/settings/settings_helper.dart | 8 ++++ .../lib/screens/settings/settings_screen.dart | 39 +++++++++------ .../settings/submenu/extras_screen.dart | 8 ++-- 5 files changed, 63 insertions(+), 42 deletions(-) diff --git a/filcnaplo_mobile_ui/lib/premium/components/plan_card.dart b/filcnaplo_mobile_ui/lib/premium/components/plan_card.dart index effd679..253cbd7 100755 --- a/filcnaplo_mobile_ui/lib/premium/components/plan_card.dart +++ b/filcnaplo_mobile_ui/lib/premium/components/plan_card.dart @@ -42,7 +42,8 @@ class PlusPlanCard extends StatelessWidget { borderRadius: borderRadius!, ), shadowColor: Colors.transparent, - surfaceTintColor: Theme.of(context).colorScheme.background, + surfaceTintColor: Colors.white, + color: Colors.white, child: Padding( padding: const EdgeInsets.only( top: 18.0, bottom: 16.0, left: 22.0, right: 18.0), diff --git a/filcnaplo_mobile_ui/lib/premium/plus_screen.dart b/filcnaplo_mobile_ui/lib/premium/plus_screen.dart index cde236d..8a08041 100644 --- a/filcnaplo_mobile_ui/lib/premium/plus_screen.dart +++ b/filcnaplo_mobile_ui/lib/premium/plus_screen.dart @@ -19,6 +19,7 @@ class PlusScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: const Color(0xffF4F9FF), body: Container( padding: EdgeInsets.zero, width: double.infinity, @@ -33,11 +34,11 @@ class PlusScreen extends StatelessWidget { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - Theme.of(context).scaffoldBackgroundColor.withOpacity(0.1), - Theme.of(context).scaffoldBackgroundColor.withOpacity(0.15), - Theme.of(context).scaffoldBackgroundColor.withOpacity(0.25), - Theme.of(context).scaffoldBackgroundColor.withOpacity(0.4), - Theme.of(context).scaffoldBackgroundColor.withOpacity(0.5), + const Color(0xffF4F9FF).withOpacity(0.1), + const Color(0xffF4F9FF).withOpacity(0.15), + const Color(0xffF4F9FF).withOpacity(0.25), + const Color(0xffF4F9FF).withOpacity(0.4), + const Color(0xffF4F9FF).withOpacity(0.5), ], begin: Alignment.topCenter, end: Alignment.bottomCenter, @@ -50,19 +51,11 @@ class PlusScreen extends StatelessWidget { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - Theme.of(context) - .scaffoldBackgroundColor - .withOpacity(0.0), - Theme.of(context) - .scaffoldBackgroundColor - .withOpacity(0.4), - Theme.of(context) - .scaffoldBackgroundColor - .withOpacity(0.6), - Theme.of(context) - .scaffoldBackgroundColor - .withOpacity(0.9), - Theme.of(context).scaffoldBackgroundColor, + const Color(0xffF4F9FF).withOpacity(0.0), + const Color(0xffF4F9FF).withOpacity(0.4), + const Color(0xffF4F9FF).withOpacity(0.6), + const Color(0xffF4F9FF).withOpacity(0.9), + const Color(0xffF4F9FF), ], begin: Alignment.topCenter, end: Alignment.bottomCenter, @@ -272,8 +265,8 @@ class PlusScreen extends StatelessWidget { ), ), shadowColor: Colors.transparent, - surfaceTintColor: - Theme.of(context).colorScheme.background, + surfaceTintColor: const Color(0xffFFFFFF), + color: Colors.white, child: Padding( padding: const EdgeInsets.only( top: 18.0, @@ -289,6 +282,7 @@ class PlusScreen extends StatelessWidget { style: TextStyle( fontSize: 16.6, fontWeight: FontWeight.w600, + color: Colors.black, ), ), const SizedBox( @@ -343,8 +337,8 @@ class PlusScreen extends StatelessWidget { ), ), shadowColor: Colors.transparent, - surfaceTintColor: - Theme.of(context).colorScheme.background, + surfaceTintColor: const Color(0xffFFFFFF), + color: Colors.white, child: Padding( padding: const EdgeInsets.only( top: 18.0, @@ -360,6 +354,7 @@ class PlusScreen extends StatelessWidget { style: TextStyle( fontSize: 16.6, fontWeight: FontWeight.w600, + color: Colors.black, ), ), const SizedBox( @@ -402,8 +397,8 @@ class PlusScreen extends StatelessWidget { ), ), shadowColor: Colors.transparent, - surfaceTintColor: - Theme.of(context).colorScheme.background, + surfaceTintColor: const Color(0xffFFFFFF), + color: Colors.white, child: Padding( padding: const EdgeInsets.only( top: 18.0, @@ -444,6 +439,7 @@ class PlusScreen extends StatelessWidget { fontWeight: FontWeight.w500, fontSize: 14.4, height: 1.3, + color: Colors.black, ), ), ), @@ -482,6 +478,7 @@ class PlusScreen extends StatelessWidget { fontWeight: FontWeight.w500, fontSize: 14.4, height: 1.3, + color: Colors.black, ), ), ), @@ -520,6 +517,7 @@ class PlusScreen extends StatelessWidget { fontWeight: FontWeight.w500, fontSize: 14.4, height: 1.3, + color: Colors.black, ), ), ), @@ -558,6 +556,7 @@ class PlusScreen extends StatelessWidget { fontWeight: FontWeight.w500, fontSize: 14.4, height: 1.3, + color: Colors.black, ), ), ), diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_helper.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_helper.dart index ca67010..36889ab 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/settings_helper.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/settings_helper.dart @@ -385,6 +385,14 @@ class SettingsHelper { }), ); } + + // v5 grade rarity texts + static void surpriseGradeRarityText(BuildContext context) { + showRoundedModalBottomSheet( + context, + child: const GradeColorsSetting(), + ); + } } // Rounding modal diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart index 2eca433..990132d 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart @@ -241,16 +241,19 @@ class SettingsScreenState extends State 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 ), ], ), - 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, + ), + ], ), ], ), diff --git a/filcnaplo_mobile_ui/lib/screens/settings/submenu/extras_screen.dart b/filcnaplo_mobile_ui/lib/screens/settings/submenu/extras_screen.dart index 639f3de..c21f928 100644 --- a/filcnaplo_mobile_ui/lib/screens/settings/submenu/extras_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/submenu/extras_screen.dart @@ -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 { 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(