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

Merge branch 'dev' into notifications

Browse Source
This commit is contained in:
hiihhaha
2024-03-10 18:33:17 +01:00
committed by GitHub
parent dfd3f42550 5522856f47
commit 5e63c73c3b
287 changed files with 7853 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
refilc_mobile_ui/lib/screens/error_report_screen.dart
View File

@@ -14,37 +14,31 @@ class ErrorReportScreen extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Colors.red,
backgroundColor: Color(0xFFE3EBFB),
body: SafeArea(
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
children: [
const Align(
alignment: Alignment.topLeft,
child: BackButton(),
),
const Spacer(),
const Icon(
FeatherIcons.alertTriangle,
size: 100,
),
const Spacer(),
Image.asset('assets/icons/ic_rounded.png', height: 40),
const SizedBox(height: 16),
Padding(
padding: const EdgeInsets.only(bottom: 4.0),
child: Text(
"uhoh".i18n,
style: const TextStyle(
color: Colors.white,
fontSize: 32.0,
fontWeight: FontWeight.w900,
"ekretaYou".i18n,
style: TextStyle(
color: Color(0xFF011234).withOpacity(0.7),
fontSize: 24.0,
fontWeight: FontWeight.w700,
),
),
),
Text(
"description".i18n,
style: TextStyle(
color: Colors.white.withOpacity(.95),
"description".i18n, //TODO: randomize using DirtyWords.xml
textAlign: TextAlign.center,
style: const TextStyle(
color: Color(0xFF011234),
fontSize: 24.0,
fontWeight: FontWeight.w700,
),
@@ -54,17 +48,29 @@ class ErrorReportScreen extends StatelessWidget {
alignment: Alignment.topRight,
children: [
Container(
height: 110.0,
height: 244.0,
width: double.infinity,
padding: const EdgeInsets.all(12.0),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12.0),
color: Colors.black.withOpacity(.2)),
borderRadius: BorderRadius.circular(12.0),
color: const Color(0xFFF7F9FC),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.2),
spreadRadius: 5,
blurRadius: 7,
offset:
const Offset(0, 3), // changes position of shadow
),
],
),
child: SingleChildScrollView(
physics: const BouncingScrollPhysics(),
child: Text(
details.exceptionAsString(),
style: const TextStyle(fontFamily: 'SpaceMono'),
style: const TextStyle(
fontFamily: 'GeistMono',
fontWeight: FontWeight.w500),
),
),
),
@@ -78,14 +84,16 @@ class ErrorReportScreen extends StatelessWidget {
)
],
),
const Spacer(),
const SizedBox(height: 16),
SizedBox(
width: double.infinity,
height: 48,
child: TextButton(
style: ButtonStyle(
padding: MaterialStateProperty.all(
const EdgeInsets.symmetric(vertical: 14.0)),
backgroundColor: MaterialStateProperty.all(Colors.white),
const EdgeInsets.symmetric(vertical: 10.0)),
backgroundColor:
MaterialStateProperty.all(const Color(0xFF0E275A)),
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12.0)),
@@ -94,14 +102,47 @@ class ErrorReportScreen extends StatelessWidget {
child: Text(
"submit".i18n,
style: const TextStyle(
color: Colors.black,
fontSize: 17.0,
fontWeight: FontWeight.bold,
),
color: Color(0xFFF7F9FC),
fontSize: 18.0,
fontWeight: FontWeight.w700,
fontFamily: 'Montserrat'),
),
onPressed: () => reportProblem(context),
),
),
const SizedBox(height: 8),
SizedBox(
width: double.infinity,
height: 48,
child: OutlinedButton(
style: ButtonStyle(
padding: MaterialStateProperty.all(
const EdgeInsets.symmetric(vertical: 14.0),
),
backgroundColor: MaterialStateProperty.all(
Color(0xFFF3F7FE),
),
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12.0),
),
),
side: MaterialStateProperty.all(
BorderSide(width: 1.0, color: Color(0xFFC7D3EB)),
),
),
child: Text(
"goback".i18n,
style: const TextStyle(
color: Color(0xFF011234),
fontSize: 18.0,
fontFamily: 'Montserrat',
fontWeight: FontWeight.w700,
),
),
onPressed: () => Navigator.maybePop(context),
),
),
const SizedBox(height: 32.0)
],
),
@@ -203,12 +244,13 @@ class ErrorDetail extends StatelessWidget {
const EdgeInsets.symmetric(horizontal: 6.5, vertical: 4.0),
margin: const EdgeInsets.only(top: 4.0),
decoration: BoxDecoration(
color: Colors.black26,
color: Color.fromARGB(255, 218, 218, 218),
borderRadius: BorderRadius.circular(4.0)),
child: Text(
content,
style: const TextStyle(
fontFamily: 'SpaceMono', color: Colors.white),
fontFamily: 'GeistMono',
color: Color.fromARGB(255, 0, 0, 0)),
))
],
),

13
refilc_mobile_ui/lib/screens/error_report_screen.i18n.dart
View File

@@ -4,9 +4,10 @@ extension SettingsLocalization on String {
static final _t = Translations.byLocale("hu_hu") +
{
"en_en": {
"uhoh": "Uh Oh!",
"ekretaYou": "eKréta, you",
"description": "An error occurred!",
"submit": "Submit",
"goback": "Go back",
"details": "Details",
"error": "Error",
"os": "Operating System",
@@ -15,9 +16,10 @@ extension SettingsLocalization on String {
"done": "Done",
},
"hu_hu": {
"uhoh": "Ajajj!",
"description": "Hiba történt!",
"submit": "Probléma Jelentése",
"ekretaYou": "eKréta, te",
"description": "Fasz-emulátor hivatásos balfasz!",
"submit": "Hiba jelentése",
"goback": "Vissza",
"details": "Részletek",
"error": "Hiba",
"os": "Operációs Rendszer",
@@ -26,9 +28,10 @@ extension SettingsLocalization on String {
"done": "Kész",
},
"de_de": {
"uhoh": "Uh Oh!",
"ekretaYou": "eKréta, du",
"description": "Ein Fehler ist aufgetreten!",
"submit": "Abschicken",
"goback": "Zurück",
"details": "Details",
"error": "Fehler",
"os": "Betriebssystem",

7
refilc_mobile_ui/lib/screens/login/login_screen.dart
View File

@@ -103,9 +103,10 @@ class LoginScreenState extends State<LoginScreen> {
),
),
),
const SizedBox(
height: 50.0,
),
if (!showBack)
const SizedBox(
height: 20.0,
),
// app icon
Padding(

39
refilc_mobile_ui/lib/screens/navigation/navbar_item.dart
View File

@@ -34,28 +34,29 @@ class NavbarItem extends StatelessWidget {
padding: const EdgeInsets.all(12.0),
decoration: BoxDecoration(
color: active
? Theme.of(context).colorScheme.secondary.withOpacity(.4)
? Theme.of(context).colorScheme.secondary.withOpacity(.2)
: null,
borderRadius: BorderRadius.circular(14.0),
),
child: Stack(
children: [
IconTheme(
data: IconThemeData(
color: Theme.of(context).colorScheme.secondary,
),
child: icon,
),
IconTheme(
data: IconThemeData(
color: Theme.of(context).brightness == Brightness.light
? Colors.black.withOpacity(.5)
: Colors.white.withOpacity(.3),
),
child: icon,
),
],
),
child: icon,
// child: Stack(
// children: [
// IconTheme(
// data: IconThemeData(
// color: Theme.of(context).colorScheme.secondary,
// ),
// child: icon,
// ),
// IconTheme(
// data: IconThemeData(
// color: Theme.of(context).brightness == Brightness.light
// ? Colors.black.withOpacity(.5)
// : Colors.white.withOpacity(.3),
// ),
// child: icon,
// ),
// ],
// ),
),
),
),

4
refilc_mobile_ui/lib/screens/navigation/navigation_route.dart
View File

@@ -6,8 +6,10 @@ class NavigationRoute {
"home",
"grades",
"timetable",
"messages",
"notes",
"absences",
// "messages",
// "absences",
];
String get name => _name;

12
refilc_mobile_ui/lib/screens/navigation/navigation_route_handler.dart
View File

@@ -1,7 +1,9 @@
// import 'package:refilc_mobile_ui/pages/absences/absences_page.dart';
import 'package:refilc_mobile_ui/pages/absences/absences_page.dart';
import 'package:refilc_mobile_ui/pages/grades/grades_page.dart';
import 'package:refilc_mobile_ui/pages/home/home_page.dart';
import 'package:refilc_mobile_ui/pages/messages/messages_page.dart';
import 'package:refilc_mobile_ui/pages/notes/notes_page.dart';
// import 'package:refilc_mobile_ui/pages/messages/messages_page.dart';
import 'package:refilc_mobile_ui/pages/timetable/timetable_page.dart';
import 'package:flutter/material.dart';
import 'package:animations/animations.dart';
@@ -14,10 +16,14 @@ Route navigationRouteHandler(RouteSettings settings) {
return navigationPageRoute((context) => const GradesPage());
case "timetable":
return navigationPageRoute((context) => const TimetablePage());
case "messages":
return navigationPageRoute((context) => const MessagesPage());
case "notes":
return navigationPageRoute((context) => const NotesPage());
case "absences":
return navigationPageRoute((context) => const AbsencesPage());
// case "messages":
// return navigationPageRoute((context) => const MessagesPage());
// case "absences":
// return navigationPageRoute((context) => const AbsencesPage());
default:
return navigationPageRoute((context) => const HomePage());
}

207
refilc_mobile_ui/lib/screens/navigation/navigation_screen.dart
View File

@@ -1,5 +1,8 @@
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:flutter_svg/svg.dart';
import 'package:refilc/api/providers/update_provider.dart';
import 'package:refilc/helpers/quick_actions.dart';
import 'package:refilc/icons/filc_icons.dart';
import 'package:refilc/models/settings.dart';
import 'package:refilc/theme/observer.dart';
import 'package:refilc/utils/navigation_service.dart';
@@ -11,7 +14,7 @@ import 'package:refilc_mobile_ui/screens/navigation/nabar.dart';
import 'package:refilc_mobile_ui/screens/navigation/navbar_item.dart';
import 'package:refilc_mobile_ui/screens/navigation/navigation_route.dart';
import 'package:refilc_mobile_ui/screens/navigation/navigation_route_handler.dart';
import 'package:refilc/icons/filc_icons.dart';
// import 'package:refilc/icons/filc_icons.dart';
import 'package:refilc_mobile_ui/screens/navigation/status_bar.dart';
import 'package:refilc_mobile_ui/screens/news/news_view.dart';
import 'package:refilc_mobile_ui/screens/settings/settings_screen.dart';
@@ -19,7 +22,7 @@ import 'package:refilc_plus/ui/mobile/goal_planner/goal_complete_modal.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
// import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:provider/provider.dart';
import 'package:refilc_mobile_ui/common/screens.i18n.dart';
import 'package:refilc/api/providers/news_provider.dart';
@@ -236,6 +239,9 @@ class NavigationScreenState extends State<NavigationScreen>
_navigatorState.currentState?.pushReplacementNamed(page);
});
// SvgTheme navIcTheme =
// SvgTheme(currentColor: Theme.of(context).colorScheme.primary);
// ignore: deprecated_member_use
return WillPopScope(
onWillPop: () async {
@@ -257,6 +263,7 @@ class NavigationScreenState extends State<NavigationScreen>
child: Scaffold(
body: Column(
children: [
// actual page
Expanded(
child: Stack(
alignment: Alignment.bottomCenter,
@@ -271,49 +278,163 @@ class NavigationScreenState extends State<NavigationScreen>
),
),
// Status bar
Material(
color: Theme.of(context).colorScheme.background,
child: const StatusBar(),
),
// navbar
Container(
decoration: settings.navShadow && selected.name != "timetable"
? BoxDecoration(
boxShadow: [
BoxShadow(
color: Theme.of(context).scaffoldBackgroundColor,
offset: const Offset(0, -4),
blurRadius: 14,
spreadRadius: 18,
),
],
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
stops: const [0.0, 0.175],
colors: [
Theme.of(context).scaffoldBackgroundColor,
Theme.of(context).scaffoldBackgroundColor,
],
),
)
: null,
child: Column(
children: [
// Status bar
Material(
color: Theme.of(context).colorScheme.background,
child: const StatusBar(),
),
// Bottom Navigaton Bar
Material(
color: Theme.of(context).scaffoldBackgroundColor,
child: MediaQuery.removePadding(
context: context,
removeTop: true,
child: Navbar(
selectedIndex: selected.index,
onSelected: onPageSelected,
items: [
NavItem(
title: "home".i18n,
icon: const Icon(FilcIcons.home),
activeIcon: const Icon(FilcIcons.homefill),
// Bottom Navigaton Bar
Material(
color: Theme.of(context).scaffoldBackgroundColor,
child: MediaQuery.removePadding(
context: context,
removeTop: true,
child: Navbar(
selectedIndex: selected.index,
onSelected: onPageSelected,
items: [
NavItem(
title: "home".i18n,
icon: Stack(
alignment: AlignmentDirectional.center,
children: [
SvgPicture.asset(
'assets/svg/menu_icons/today.svg',
color:
Theme.of(context).colorScheme.secondary,
height: 24,
),
Transform.translate(
offset: const Offset(0, 1.6),
child: Text(
DateTime.now().day.toString(),
style: TextStyle(
color: Theme.of(context)
.colorScheme
.secondary,
fontWeight: FontWeight.w500,
),
),
),
],
),
activeIcon: Stack(
alignment: AlignmentDirectional.center,
children: [
SvgPicture.asset(
'assets/svg/menu_icons/today_selected.svg',
color:
Theme.of(context).colorScheme.secondary,
height: 24,
),
Transform.translate(
offset: const Offset(0, 1.8),
child: Text(
DateTime.now().day.toString(),
style: TextStyle(
color: Theme.of(context)
.colorScheme
.background,
fontWeight: FontWeight.w500,
),
),
),
],
),
),
NavItem(
title: "grades".i18n,
icon: SvgPicture.asset(
'assets/svg/menu_icons/grades.svg',
color: Theme.of(context).colorScheme.secondary,
height: 22,
),
activeIcon: SvgPicture.asset(
'assets/svg/menu_icons/grades_selected.svg',
color: Theme.of(context).colorScheme.secondary,
height: 22,
),
),
NavItem(
title: "timetable".i18n,
icon: SvgPicture.asset(
'assets/svg/menu_icons/timetable.svg',
color: Theme.of(context).colorScheme.secondary,
height: 22,
),
activeIcon: SvgPicture.asset(
'assets/svg/menu_icons/timetable_selected.svg',
color: Theme.of(context).colorScheme.secondary,
height: 22,
),
),
NavItem(
title: "notes".i18n,
icon: SvgPicture.asset(
'assets/svg/menu_icons/notes.svg',
color: Theme.of(context).colorScheme.secondary,
height: 22,
),
activeIcon: SvgPicture.asset(
'assets/svg/menu_icons/notes_selected.svg',
color: Theme.of(context).colorScheme.secondary,
height: 22,
),
),
NavItem(
title: "absences".i18n,
icon: Icon(
FeatherIcons.clock,
color: Theme.of(context).colorScheme.secondary,
size: 24.0,
),
activeIcon: Icon(
FilcIcons.absencesfill,
color: Theme.of(context).colorScheme.secondary,
size: 24.0,
),
),
// NavItem(
// title: "messages".i18n,
// icon: const Icon(FeatherIcons.messageSquare),
// activeIcon: const Icon(FilcIcons.messagesfill),
// ),
// NavItem(
// title: "absences".i18n,
// icon: const Icon(FeatherIcons.clock),
// activeIcon: const Icon(FilcIcons.absencesfill),
// ),
],
),
),
NavItem(
title: "grades".i18n,
icon: const Icon(FeatherIcons.bookmark),
activeIcon: const Icon(FilcIcons.gradesfill),
),
NavItem(
title: "timetable".i18n,
icon: const Icon(FeatherIcons.calendar),
activeIcon: const Icon(FilcIcons.timetablefill),
),
NavItem(
title: "messages".i18n,
icon: const Icon(FeatherIcons.messageSquare),
activeIcon: const Icon(FilcIcons.messagesfill),
),
NavItem(
title: "absences".i18n,
icon: const Icon(FeatherIcons.clock),
activeIcon: const Icon(FilcIcons.absencesfill),
),
],
),
),
],
),
),
],

13
refilc_mobile_ui/lib/screens/notes/notes_screen.dart
View File

@@ -15,12 +15,14 @@ import 'package:refilc_mobile_ui/screens/notes/add_note_screen.dart';
import 'package:refilc_mobile_ui/screens/notes/note_view_screen.dart';
import 'package:refilc_mobile_ui/screens/notes/notes_screen.i18n.dart';
import 'package:refilc_mobile_ui/screens/notes/self_note_tile.dart';
import 'package:refilc_plus/models/premium_scopes.dart';
import 'package:refilc_plus/providers/premium_provider.dart';
import 'package:refilc_plus/ui/mobile/premium/premium_inline.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:provider/provider.dart';
import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
class NotesScreen extends StatefulWidget {
const NotesScreen({super.key, required this.doneItems});
@@ -58,7 +60,9 @@ class NotesScreenState extends State<NotesScreen> {
// todo tiles
List<Widget> toDoTiles = [];
if (hw.isNotEmpty) {
if (hw.isNotEmpty &&
Provider.of<PremiumProvider>(context, listen: false)
.hasScope(PremiumScopes.unlimitedSelfNotes)) {
toDoTiles.addAll(hw.map((e) => TickTile(
padding: EdgeInsets.zero,
title: 'homework'.i18n,
@@ -209,6 +213,13 @@ class NotesScreenState extends State<NotesScreen> {
child: GestureDetector(
onTap: () {
// handle tap
if (!Provider.of<PremiumProvider>(context, listen: false)
.hasScope(PremiumScopes.unlimitedSelfNotes) &&
noteTiles.length > 10) {
return PremiumLockedFeatureUpsell.show(
context: context, feature: PremiumFeature.selfNotes);
}
Navigator.of(context, rootNavigator: true).push(
CupertinoPageRoute(
builder: (context) => const AddNoteScreen()));

2
refilc_mobile_ui/lib/screens/settings/accounts/account_view.dart
View File

@@ -30,7 +30,7 @@ class AccountView extends StatelessWidget {
AccountTile(
profileImage: ProfileImage(
name: _firstName,
backgroundColor: Theme.of(context).colorScheme.primary,
backgroundColor: Theme.of(context).colorScheme.secondary,
role: user.role,
),
name: SelectableText(

162
refilc_mobile_ui/lib/screens/settings/settings_helper.dart
View File

@@ -36,9 +36,10 @@ import 'package:flutter_material_color_picker/flutter_material_color_picker.dart
import 'package:refilc/models/icon_pack.dart';
import 'package:refilc/utils/format.dart';
import 'package:refilc_mobile_ui/screens/settings/theme_screen.dart';
import 'package:refilc_plus/models/premium_scopes.dart';
import 'package:refilc_plus/providers/premium_provider.dart';
import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
// import 'package:refilc_plus/models/premium_scopes.dart';
// import 'package:refilc_plus/providers/premium_provider.dart';
// import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
import 'package:refilc_plus/ui/mobile/settings/settings_helper.dart';
class SettingsHelper {
static const Map<String, String> langMap = {
@@ -408,12 +409,20 @@ class SettingsHelper {
} else if (index == accountTiles.length + 1) {
return PanelButton(
onPressed: () {
if (!Provider.of<PremiumProvider>(context, listen: false)
.hasScope(PremiumScopes.maxTwoAccounts)) {
PremiumLockedFeatureUpsell.show(
context: context, feature: PremiumFeature.moreAccounts);
return;
}
// if (!Provider.of<PremiumProvider>(context, listen: false)
// .hasScope(PremiumScopes.maxTwoAccounts)) {
// PremiumLockedFeatureUpsell.show(
// context: context, feature: PremiumFeature.moreAccounts);
// return;
// }
// if ((accountTiles.length - 1 == 2) &&
// !Provider.of<PremiumProvider>(context, listen: false)
// .hasScope(PremiumScopes.noAccountLimit)) {
// PremiumLockedFeatureUpsell.show(
// context: context, feature: PremiumFeature.moreAccounts);
// return;
// }
Navigator.of(context).pushNamed("login_back").then((value) {
setSystemChrome(context);
@@ -783,141 +792,6 @@ class _GradeColorsSettingState extends State<GradeColorsSetting> {
}
}
class GradeRarityTextSetting extends StatefulWidget {
const GradeRarityTextSetting({
super.key,
required this.title,
required this.cancel,
required this.done,
required this.defaultRarities,
});
final String title;
final String cancel;
final String done;
final List<String> defaultRarities;
@override
_GradeRarityTextSettingState createState() => _GradeRarityTextSettingState();
}
class _GradeRarityTextSettingState extends State<GradeRarityTextSetting> {
late SettingsProvider settings;
late DatabaseProvider db;
late UserProvider user;
final _rarityText = TextEditingController();
@override
void initState() {
super.initState();
settings = Provider.of<SettingsProvider>(context, listen: false);
db = Provider.of<DatabaseProvider>(context, listen: false);
user = Provider.of<UserProvider>(context, listen: false);
}
@override
Widget build(BuildContext context) {
return Column(children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: List.generate(5, (index) {
return ClipOval(
child: Material(
type: MaterialType.transparency,
child: InkWell(
onTap: () async {
showRenameDialog(
title: widget.title,
cancel: widget.cancel,
done: widget.done,
rarities:
await db.userQuery.getGradeRarities(userId: user.id!),
gradeIndex: (index + 1).toString(),
defaultRarities: widget.defaultRarities,
);
},
child: GradeValueWidget(GradeValue(index + 1, "", "", 0),
fill: true, size: 36.0),
),
),
);
}),
),
),
]);
}
void showRenameDialog(
{required String title,
required String cancel,
required String done,
required Map<String, String> rarities,
required String gradeIndex,
required List<String> defaultRarities,
required}) {
showDialog(
context: context,
builder: (context) => StatefulBuilder(builder: (context, setS) {
String? rr = rarities[gradeIndex];
rr ??= '';
_rarityText.text = rr;
return AlertDialog(
title: Text(title),
content: TextField(
controller: _rarityText,
autofocus: true,
decoration: InputDecoration(
border: const OutlineInputBorder(),
label: Text(defaultRarities[int.parse(gradeIndex) - 1]),
suffixIcon: IconButton(
icon: const Icon(FeatherIcons.x),
onPressed: () {
setState(() {
_rarityText.clear();
});
},
),
),
),
actions: [
TextButton(
child: Text(
cancel,
style: const TextStyle(fontWeight: FontWeight.w500),
),
onPressed: () {
Navigator.of(context).maybePop();
},
),
TextButton(
child: Text(
done,
style: const TextStyle(fontWeight: FontWeight.w500),
),
onPressed: () {
rarities[gradeIndex] = _rarityText.text;
Provider.of<DatabaseProvider>(context, listen: false)
.userStore
.storeGradeRarities(rarities, userId: user.id!);
Navigator.of(context).pop(true);
},
),
],
);
}),
).then((val) {
_rarityText.clear();
});
}
}
class LiveActivityColorSetting extends StatefulWidget {
const LiveActivityColorSetting({super.key});

31
refilc_mobile_ui/lib/screens/settings/settings_screen.dart
View File

@@ -59,7 +59,8 @@ import 'package:refilc_mobile_ui/screens/settings/user/nickname.dart';
import 'package:refilc_mobile_ui/screens/settings/user/profile_pic.dart';
// import 'package:refilc_plus/ui/mobile/settings/modify_teacher_names.dart';
// import 'package:refilc_plus/ui/mobile/settings/welcome_message.dart';
// import 'package:refilc_mobile_ui/screens/error_screen.dart';
import 'package:refilc_mobile_ui/screens/error_report_screen.dart';
import 'submenu/general_screen.dart';
class SettingsScreen extends StatefulWidget {
@@ -132,7 +133,7 @@ class SettingsScreenState extends State<SettingsScreen>
profilePictureString: account.picture,
backgroundColor: Theme.of(context)
.colorScheme
.primary, //!settings.presentationMode
.secondary, //!settings.presentationMode
//? ColorUtils.stringToColor(account.name)
//: Theme.of(context).colorScheme.secondary,
),
@@ -198,6 +199,17 @@ class SettingsScreenState extends State<SettingsScreen>
vsync: this, duration: const Duration(milliseconds: 200));
}
void showErrorScreen(BuildContext context, FlutterErrorDetails details) {
Navigator.of(context, rootNavigator: true)
.push(MaterialPageRoute(builder: (context) {
if (kReleaseMode) {
return ErrorReportScreen(details);
} else {
return ErrorReportScreen(details);
}
}));
}
@override
Widget build(BuildContext context) {
user = Provider.of<UserProvider>(context);
@@ -307,7 +319,7 @@ class SettingsScreenState extends State<SettingsScreen>
profilePictureString: user.picture,
backgroundColor: Theme.of(context)
.colorScheme
.primary, //!settings.presentationMode
.secondary, //!settings.presentationMode
//? ColorUtils.stringToColor(user.displayName ?? "?")
//: Theme.of(context).colorScheme.secondary,
),
@@ -993,6 +1005,19 @@ class SettingsScreenState extends State<SettingsScreen>
),
],
),
ElevatedButton(
onPressed: () {
// Generate fake error details
FlutterErrorDetails fakeErrorDetails = FlutterErrorDetails(
exception: Exception('fasz'),
stack: StackTrace.current,
library: 'MyApp',
context: ErrorDescription('a kurva a-'),
);
showErrorScreen(context, fakeErrorDetails);
},
child: Text('hiba_tesztelese'),
),
// developer options
if (settings.developerMode)

602
refilc_mobile_ui/lib/screens/settings/submenu/calendar_sync.dart
View File

@@ -1,602 +0,0 @@
// ignore_for_file: use_build_context_synchronously
import 'package:refilc/api/providers/user_provider.dart';
import 'package:refilc/models/linked_account.dart';
import 'package:refilc/models/settings.dart';
import 'package:refilc/providers/third_party_provider.dart';
import 'package:refilc/theme/colors/colors.dart';
import 'package:refilc_kreta_api/providers/share_provider.dart';
import 'package:refilc_mobile_ui/common/dot.dart';
import 'package:refilc_mobile_ui/common/panel/panel_button.dart';
import 'package:refilc_mobile_ui/common/splitted_panel/splitted_panel.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:provider/provider.dart';
import 'package:refilc_mobile_ui/common/widgets/custom_segmented_control.dart';
import 'package:refilc_mobile_ui/screens/settings/settings_screen.i18n.dart';
class MenuCalendarSync extends StatelessWidget {
const MenuCalendarSync({
super.key,
this.borderRadius = const BorderRadius.vertical(
top: Radius.circular(4.0), bottom: Radius.circular(4.0)),
});
final BorderRadius borderRadius;
@override
Widget build(BuildContext context) {
return PanelButton(
onPressed: () async {
Navigator.of(context, rootNavigator: true).push(CupertinoPageRoute(
builder: (context) => const CalendarSyncScreen()));
},
title: Text(
"calendar_sync".i18n,
style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95),
),
),
leading: Icon(
FeatherIcons.calendar,
size: 22.0,
color: AppColors.of(context).text.withOpacity(.95),
),
trailing: Icon(
FeatherIcons.chevronRight,
size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95),
),
borderRadius: borderRadius,
);
}
}
class CalendarSyncScreen extends StatefulWidget {
const CalendarSyncScreen({super.key});
@override
CalendarSyncScreenState createState() => CalendarSyncScreenState();
}
class CalendarSyncScreenState extends State<CalendarSyncScreen>
with SingleTickerProviderStateMixin {
late SettingsProvider settingsProvider;
late UserProvider user;
late ShareProvider shareProvider;
late ThirdPartyProvider thirdPartyProvider;
late AnimationController _hideContainersController;
@override
void initState() {
super.initState();
shareProvider = Provider.of<ShareProvider>(context, listen: false);
_hideContainersController = AnimationController(
vsync: this, duration: const Duration(milliseconds: 200));
}
@override
Widget build(BuildContext context) {
settingsProvider = Provider.of<SettingsProvider>(context);
user = Provider.of<UserProvider>(context);
thirdPartyProvider = Provider.of<ThirdPartyProvider>(context);
return AnimatedBuilder(
animation: _hideContainersController,
builder: (context, child) => Opacity(
opacity: 1 - _hideContainersController.value,
child: Scaffold(
appBar: AppBar(
surfaceTintColor: Theme.of(context).scaffoldBackgroundColor,
leading: BackButton(color: AppColors.of(context).text),
title: Text(
"calendar_sync".i18n,
style: TextStyle(color: AppColors.of(context).text),
),
),
body: SingleChildScrollView(
child: Padding(
padding:
const EdgeInsets.symmetric(vertical: 16.0, horizontal: 24.0),
child: Column(
children: [
// banner
Padding(
padding: const EdgeInsets.only(top: 10),
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12.0),
image: const DecorationImage(
image: AssetImage(
'assets/images/banner_texture.png',
),
fit: BoxFit.cover,
),
),
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 40,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(16.0),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.2),
blurRadius: 4.0,
spreadRadius: 0.01,
),
],
),
height: 64,
width: 64,
child: const Icon(
Icons.calendar_month,
size: 38.0,
),
),
const SizedBox(width: 10),
Icon(
Icons.sync_alt_outlined,
color: AppColors.of(context).text.withOpacity(
thirdPartyProvider.linkedAccounts.isEmpty
? 0.2
: 0.5),
size: 20.0,
),
const SizedBox(width: 10),
Container(
decoration: BoxDecoration(
color: Colors.transparent,
borderRadius: BorderRadius.circular(16.0),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.2),
blurRadius: 4.0,
spreadRadius: 0.01,
),
],
),
child: Image.asset(
'assets/icons/ic_rounded.png',
width: 64,
height: 64,
),
),
],
),
),
),
),
const SizedBox(
height: 18.0,
),
// choose account if not logged in
if (thirdPartyProvider.linkedAccounts.isEmpty)
Column(
children: [
SplittedPanel(
title: Text('choose_account'.i18n),
padding: EdgeInsets.zero,
cardPadding: const EdgeInsets.all(4.0),
isSeparated: true,
children: [
PanelButton(
onPressed: () async {
await Provider.of<ThirdPartyProvider>(context,
listen: false)
.googleSignIn();
setState(() {});
},
title: Text(
'Google',
style: TextStyle(
color: AppColors.of(context)
.text
.withOpacity(.95),
),
),
leading: Image.asset(
'assets/images/ext_logo/google.png',
width: 24.0,
height: 24.0,
),
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12),
bottom: Radius.circular(12),
),
),
],
),
const SizedBox(
height: 9.0,
),
SplittedPanel(
padding: EdgeInsets.zero,
cardPadding: const EdgeInsets.all(4.0),
isSeparated: true,
children: [
PanelButton(
onPressed: null,
title: Text(
'Apple',
style: TextStyle(
color: AppColors.of(context)
.text
.withOpacity(.55),
decoration: TextDecoration.lineThrough,
),
),
leading: Image.asset(
'assets/images/ext_logo/apple.png',
width: 24.0,
height: 24.0,
),
trailing: Text(
'soon'.i18n,
style: const TextStyle(
fontStyle: FontStyle.italic,
fontSize: 14.0),
),
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12),
bottom: Radius.circular(12),
),
),
],
),
],
),
// show options if logged in
if (thirdPartyProvider.linkedAccounts.isNotEmpty)
Column(
children: [
SplittedPanel(
title: Text('your_account'.i18n),
padding: EdgeInsets.zero,
cardPadding: const EdgeInsets.all(4.0),
children: [
PanelButton(
onPressed: null,
title: Text(
thirdPartyProvider
.linkedAccounts.first.username,
style: TextStyle(
color: AppColors.of(context)
.text
.withOpacity(.95),
),
),
leading: Image.asset(
'assets/images/ext_logo/${thirdPartyProvider.linkedAccounts.first.type == AccountType.google ? "google" : "apple"}.png',
width: 24.0,
height: 24.0,
),
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12),
bottom: Radius.circular(12),
),
),
PanelButton(
onPressed: () async {
await thirdPartyProvider.signOutAll();
setState(() {});
},
title: Text(
'change_account'.i18n,
style: TextStyle(
color: AppColors.of(context)
.text
.withOpacity(.95),
),
),
trailing: Icon(
FeatherIcons.chevronRight,
size: 22.0,
color: AppColors.of(context)
.text
.withOpacity(0.95),
),
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12),
bottom: Radius.circular(12),
),
),
],
),
const SizedBox(
height: 18.0,
),
SplittedPanel(
title: Text('choose_calendar'.i18n),
padding: EdgeInsets.zero,
cardPadding: EdgeInsets.zero,
isTransparent: true,
children: getCalendarList(),
),
const SizedBox(
height: 18.0,
),
SplittedPanel(
title: Text('room_num_location'.i18n),
padding: EdgeInsets.zero,
cardPadding: EdgeInsets.zero,
isTransparent: true,
children: [
CustomSegmentedControl(
onChanged: (v) {
settingsProvider.update(
calSyncRoomLocation:
v == 0 ? 'location' : 'description');
},
value: settingsProvider.calSyncRoomLocation ==
'location'
? 0
: 1,
height: 45,
children: [
Text(
'location'.i18n,
style: const TextStyle(
fontWeight: FontWeight.w500,
fontSize: 16.0,
),
),
Text(
'description'.i18n,
style: const TextStyle(
fontWeight: FontWeight.w500,
fontSize: 16.0,
),
),
],
),
],
),
const SizedBox(
height: 18.0,
),
SplittedPanel(
title: Text('options'.i18n),
padding: EdgeInsets.zero,
cardPadding: EdgeInsets.zero,
isTransparent: true,
isSeparated: true,
children: [
SplittedPanel(
padding: EdgeInsets.zero,
cardPadding: const EdgeInsets.all(4.0),
children: [
PanelButton(
padding: const EdgeInsets.only(
left: 14.0, right: 6.0),
onPressed: () async {
settingsProvider.update(
calSyncShowExams:
!settingsProvider.calSyncShowExams);
setState(() {});
},
title: Text(
"show_exams".i18n,
style: TextStyle(
color: AppColors.of(context)
.text
.withOpacity(
settingsProvider.calSyncShowExams
? .95
: .25),
),
),
trailing: Switch(
onChanged: (v) async {
settingsProvider.update(
calSyncShowExams: v);
setState(() {});
},
value: settingsProvider.calSyncShowExams,
activeColor:
Theme.of(context).colorScheme.secondary,
),
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12.0),
bottom: Radius.circular(12.0),
),
),
],
),
SplittedPanel(
padding: EdgeInsets.zero,
cardPadding: const EdgeInsets.all(4.0),
children: [
PanelButton(
padding: const EdgeInsets.only(
left: 14.0, right: 6.0),
onPressed: () async {
settingsProvider.update(
calSyncShowTeacher: !settingsProvider
.calSyncShowTeacher);
setState(() {});
},
title: Text(
"show_teacher".i18n,
style: TextStyle(
color: AppColors.of(context)
.text
.withOpacity(settingsProvider
.calSyncShowTeacher
? .95
: .25),
),
),
trailing: Switch(
onChanged: (v) async {
settingsProvider.update(
calSyncShowTeacher: v);
setState(() {});
},
value: settingsProvider.calSyncShowTeacher,
activeColor:
Theme.of(context).colorScheme.secondary,
),
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12.0),
bottom: Radius.circular(12.0),
),
),
],
),
SplittedPanel(
padding: EdgeInsets.zero,
cardPadding: const EdgeInsets.all(4.0),
children: [
PanelButton(
padding: const EdgeInsets.only(
left: 14.0, right: 6.0),
onPressed: () async {
settingsProvider.update(
calSyncRenamed:
!settingsProvider.calSyncRenamed);
setState(() {});
},
title: Text(
"show_renamed".i18n,
style: TextStyle(
color: AppColors.of(context)
.text
.withOpacity(
settingsProvider.calSyncRenamed
? .95
: .25),
),
),
trailing: Switch(
onChanged: (v) async {
settingsProvider.update(
calSyncRenamed: v);
setState(() {});
},
value: settingsProvider.calSyncRenamed,
activeColor:
Theme.of(context).colorScheme.secondary,
),
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12.0),
bottom: Radius.circular(12.0),
),
),
],
),
],
),
],
),
],
),
),
),
),
),
);
}
List<Widget> getCalendarList() {
// List<Widget> widgets = thirdPartyProvider.googleCalendars
// .map(
// (e) => Container(
// margin: const EdgeInsets.only(bottom: 3.0),
// decoration: BoxDecoration(
// border: Border.all(
// color: Theme.of(context).colorScheme.primary.withOpacity(.25),
// width: 1.0,
// ),
// borderRadius: BorderRadius.circular(12.0),
// ),
// child: PanelButton(
// onPressed: () async {
// print((e.backgroundColor ?? '#000000').replaceAll('#', '0x'));
// setState(() {});
// },
// title: Text(
// e.summary ?? 'no_title'.i18n,
// style: TextStyle(
// color: AppColors.of(context).text.withOpacity(.95),
// ),
// ),
// leading: Dot(
// color: colorFromHex(
// e.backgroundColor ?? '#000',
// ) ??
// Colors.black,
// ),
// borderRadius: const BorderRadius.vertical(
// top: Radius.circular(12),
// bottom: Radius.circular(12),
// ),
// ),
// ),
// )
// .toList();
List<Widget> widgets = [];
widgets.add(
Container(
margin: const EdgeInsets.only(bottom: 3.0),
decoration: BoxDecoration(
// border: Border.all(
// color: Theme.of(context).colorScheme.primary.withOpacity(.25),
// width: 1.0,
// ),
color: AppColors.of(context).highlight,
borderRadius: BorderRadius.circular(16.0),
),
child: PanelButton(
onPressed: null,
// onPressed: () async {
// // thirdPartyProvider.pushTimetable(context, timetable);
// setState(() {});
// },
title: Text(
'reFilc - Órarend',
style: TextStyle(
color: AppColors.of(context).text.withOpacity(.95),
),
),
// leading: Icon(
// FeatherIcons.plus,
// size: 20.0,
// color: AppColors.of(context).text.withOpacity(0.75),
// ),
leading: Dot(
color: Theme.of(context).colorScheme.primary,
),
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12),
bottom: Radius.circular(12),
),
),
),
);
return widgets;
}
}

2
refilc_mobile_ui/lib/screens/settings/submenu/extras_screen.dart
View File

@@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:provider/provider.dart';
import 'package:refilc_mobile_ui/screens/settings/submenu/calendar_sync.dart';
import 'package:refilc_plus/ui/mobile/settings/submenu/calendar_sync.dart';
import 'package:refilc_plus/models/premium_scopes.dart';
import 'package:refilc_plus/providers/premium_provider.dart';
import 'package:refilc_plus/ui/mobile/premium/upsell.dart';

9
refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart
View File

@@ -804,6 +804,15 @@ class PersonalizeSettingsScreenState extends State<PersonalizeSettingsScreen>
children: [
PanelButton(
onPressed: () {
if (!Provider.of<PremiumProvider>(context,
listen: false)
.hasScope(PremiumScopes.customFont)) {
PremiumLockedFeatureUpsell.show(
context: context,
feature: PremiumFeature.fontChange);
return;
}
SettingsHelper.fontFamily(context);
setState(() {});
},