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

2
refilc_mobile_ui/lib/common/filter_bar.dart
View File

@@ -61,7 +61,7 @@ class _FilterBarState extends State<FilterBar> {
indicatorSize: TabBarIndicatorSize.tab,
indicatorPadding: const EdgeInsets.symmetric(vertical: 8.0),
indicator: BoxDecoration(
color: Theme.of(context).colorScheme.secondary.withOpacity(0.25),
color: Theme.of(context).colorScheme.secondary.withOpacity(.2),
borderRadius: BorderRadius.circular(45.0),
),
overlayColor: MaterialStateProperty.all(const Color(0x00000000)),

5
refilc_mobile_ui/lib/common/round_border_icon.dart
View File

@@ -1,4 +1,3 @@
import 'package:refilc/theme/colors/colors.dart';
import 'package:flutter/material.dart';
class RoundBorderIcon extends StatelessWidget {
@@ -19,7 +18,9 @@ class RoundBorderIcon extends StatelessWidget {
return Container(
decoration: BoxDecoration(
border: Border.all(
color: color ?? AppColors.of(context).text, width: width),
color: color ??
Theme.of(context).colorScheme.secondary.withOpacity(0.25),
width: width),
borderRadius: BorderRadius.circular(50.0),
),
child: Padding(

6
refilc_mobile_ui/lib/common/splitted_panel/splitted_panel.dart
View File

@@ -53,8 +53,10 @@ class SplittedPanel extends StatelessWidget {
),
border: hasBorder
? Border.all(
color:
Theme.of(context).colorScheme.primary.withOpacity(.25),
color: Theme.of(context)
.colorScheme
.secondary
.withOpacity(.25),
width: 1.0)
: null,
),

2
refilc_mobile_ui/lib/common/widgets/message/message_view_tile.dart
View File

@@ -91,7 +91,7 @@ class MessageViewTile extends StatelessWidget {
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16.0),
border: Border.all(
color: Theme.of(context).colorScheme.primary.withOpacity(.25),
color: Theme.of(context).colorScheme.secondary.withOpacity(.25),
width: 1.0,
),
),

14
refilc_mobile_ui/lib/common/widgets/note/note_view.dart
View File

@@ -1,4 +1,3 @@
import 'package:refilc/utils/color.dart';
import 'package:refilc_kreta_api/models/note.dart';
import 'package:refilc_mobile_ui/common/profile_image/profile_image.dart';
import 'package:refilc/utils/format.dart';
@@ -31,12 +30,13 @@ class NoteView extends StatelessWidget {
: note.teacher.name) ??
'',
radius: 22.0,
backgroundColor: ColorUtils.stringToColor(
(note.teacher.isRenamed
? note.teacher.renamedTo
: note.teacher.name) ??
'',
),
backgroundColor: Theme.of(context).colorScheme.secondary,
// backgroundColor: ColorUtils.stringToColor(
// (note.teacher.isRenamed
// ? note.teacher.renamedTo
// : note.teacher.name) ??
// '',
// ),
),
title: Text(
note.title,

4
refilc_mobile_ui/lib/common/widgets/tick_tile.dart
View File

@@ -58,7 +58,7 @@ class TickTileState extends State<TickTile> {
decoration: BoxDecoration(
shape: BoxShape.circle,
border: Border.all(
color: Theme.of(context).colorScheme.primary,
color: Theme.of(context).colorScheme.secondary,
width: 2.0,
),
),
@@ -67,7 +67,7 @@ class TickTileState extends State<TickTile> {
: Icon(
FeatherIcons.checkCircle,
size: 22.0,
color: Theme.of(context).colorScheme.primary,
color: Theme.of(context).colorScheme.secondary,
),
title: Row(
children: [

6
refilc_mobile_ui/lib/pages/absences/absences_page.dart
View File

@@ -164,7 +164,7 @@ class AbsencesPageState extends State<AbsencesPage>
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
.primary, //ColorUtils.stringToColor(user.displayName ?? "?"),
.secondary, //ColorUtils.stringToColor(user.displayName ?? "?"),
badge: updateProvider.available,
role: user.role,
profilePictureString: user.picture,
@@ -423,7 +423,9 @@ class AbsencesPageState extends State<AbsencesPage>
child: filterWidgets[index - (activeData <= 1 ? 1 : 0)],
);
} else {
return _tabController.index == 1 ? Empty(subtitle: "emptyDelays".i18n) : Empty(subtitle: "emptyMisses".i18n);
return _tabController.index == 1
? Empty(subtitle: "emptyDelays".i18n)
: Empty(subtitle: "emptyMisses".i18n);
}
},
),

2
refilc_mobile_ui/lib/pages/grades/grades_page.dart
View File

@@ -540,7 +540,7 @@ class GradesPageState extends State<GradesPage> {
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
.primary, //ColorUtils.stringToColor(user.displayName ?? "?"),
.secondary, //ColorUtils.stringToColor(user.displayName ?? "?"),
badge: updateProvider.available,
role: user.role,
profilePictureString: user.picture,

2
refilc_mobile_ui/lib/pages/home/home_page.dart
View File

@@ -252,7 +252,7 @@ class HomePageState extends State<HomePage> with TickerProviderStateMixin {
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
.primary, //!settings.presentationMode
.secondary, //!settings.presentationMode
//? ColorUtils.stringToColor(user.displayName ?? "?")
//: Theme.of(context).colorScheme.secondary,
badge: updateProvider.available,

2
refilc_mobile_ui/lib/pages/messages/messages_page.dart
View File

@@ -105,7 +105,7 @@ class MessagesPageState extends State<MessagesPage>
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
.primary, //ColorUtils.stringToColor(user.displayName ?? "?"),
.secondary, //ColorUtils.stringToColor(user.displayName ?? "?"),
badge: updateProvider.available,
role: user.role,
profilePictureString: user.picture,

308
refilc_mobile_ui/lib/pages/notes/notes_page.dart Normal file
View File

@@ -0,0 +1,308 @@
// ignore_for_file: no_leading_underscores_for_local_identifiers, use_build_context_synchronously
import 'dart:math';
import 'package:flutter/cupertino.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:refilc/api/providers/database_provider.dart';
import 'package:refilc/api/providers/self_note_provider.dart';
import 'package:refilc/api/providers/update_provider.dart';
import 'package:refilc/utils/format.dart';
import 'package:refilc_kreta_api/models/absence.dart';
import 'package:refilc_kreta_api/models/homework.dart';
import 'package:refilc_kreta_api/models/subject.dart';
import 'package:refilc/api/providers/user_provider.dart';
import 'package:refilc/theme/colors/colors.dart';
import 'package:refilc_kreta_api/providers/homework_provider.dart';
import 'package:refilc_mobile_ui/common/empty.dart';
import 'package:refilc_mobile_ui/common/panel/panel.dart';
import 'package:refilc_mobile_ui/common/profile_image/profile_button.dart';
import 'package:refilc_mobile_ui/common/profile_image/profile_image.dart';
import 'package:refilc_mobile_ui/common/soon_alert/soon_alert.dart';
import 'package:refilc_mobile_ui/common/widgets/tick_tile.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
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/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:refilc_plus/ui/mobile/premium/upsell.dart';
import 'notes_page.i18n.dart';
enum AbsenceFilter { absences, delays, misses }
class SubjectAbsence {
GradeSubject subject;
List<Absence> absences;
double percentage;
SubjectAbsence(
{required this.subject, this.absences = const [], this.percentage = 0.0});
}
class NotesPage extends StatefulWidget {
const NotesPage({super.key});
@override
NotesPageState createState() => NotesPageState();
}
class NotesPageState extends State<NotesPage> with TickerProviderStateMixin {
late UserProvider user;
late UpdateProvider updateProvider;
late DatabaseProvider databaseProvider;
late SelfNoteProvider selfNoteProvider;
late String firstName;
Map<String, bool> doneItems = {};
List<Widget> noteTiles = [];
void generateTiles() async {
doneItems = await databaseProvider.userQuery.toDoItems(userId: user.id!);
List<Widget> tiles = [];
List<Homework> hw = Provider.of<HomeworkProvider>(context, listen: false)
.homework
.where((e) => e.deadline.isAfter(DateTime.now()))
// e.deadline.isBefore(DateTime(DateTime.now().year,
// DateTime.now().month, DateTime.now().day + 3)))
.toList();
// todo tiles
List<Widget> toDoTiles = [];
if (hw.isNotEmpty &&
!Provider.of<PremiumProvider>(context, listen: false)
.hasScope(PremiumScopes.unlimitedSelfNotes)) {
toDoTiles.addAll(hw.map((e) => TickTile(
padding: EdgeInsets.zero,
title: 'homework'.i18n,
description:
'${(e.subject.isRenamed ? e.subject.renamedTo : e.subject.name) ?? ''}, ${e.content.escapeHtml()}',
isTicked: doneItems[e.id] ?? false,
onTap: (p0) async {
if (!doneItems.containsKey(e.id)) {
doneItems.addAll({e.id: p0});
} else {
doneItems[e.id] = p0;
}
await databaseProvider.userStore
.storeToDoItem(doneItems, userId: user.id!);
},
)));
}
if (toDoTiles.isNotEmpty) {
tiles.add(const SizedBox(
height: 10.0,
));
tiles.add(Panel(
title: Text('todo'.i18n),
child: Column(
children: toDoTiles,
),
));
}
// self notes
List<Widget> selfNoteTiles = [];
if (selfNoteProvider.notes.isNotEmpty) {
selfNoteTiles.addAll(selfNoteProvider.notes.reversed.map(
(e) => SelfNoteTile(
title: e.title ?? e.content.split(' ')[0],
content: e.content,
onTap: () => Navigator.of(context, rootNavigator: true).push(
CupertinoPageRoute(
builder: (context) => NoteViewScreen(note: e))),
),
));
}
if (selfNoteTiles.isNotEmpty) {
// padding
tiles.add(const SizedBox(
height: 28.0,
));
// actual thing
tiles.add(Panel(
title: Text('your_notes'.i18n),
padding: EdgeInsets.zero,
isTransparent: true,
child: Wrap(
spacing: 18.0,
runSpacing: 18.0,
children: selfNoteTiles,
),
));
}
// insert empty tile
if (tiles.isEmpty) {
tiles.insert(
0,
Padding(
padding: const EdgeInsets.only(top: 24.0),
child: Empty(subtitle: "empty".i18n),
),
);
}
tiles.add(Provider.of<PremiumProvider>(context, listen: false).hasPremium
? const SizedBox()
: const Padding(
padding: EdgeInsets.only(top: 24.0),
child: PremiumInline(features: [
PremiumInlineFeature.stats,
]),
));
// padding
tiles.add(const SizedBox(height: 32.0));
noteTiles = List.castFrom(tiles);
setState(() {});
}
@override
Widget build(BuildContext context) {
user = Provider.of<UserProvider>(context);
databaseProvider = Provider.of<DatabaseProvider>(context);
updateProvider = Provider.of<UpdateProvider>(context);
selfNoteProvider = Provider.of<SelfNoteProvider>(context);
List<String> nameParts = user.displayName?.split(" ") ?? ["?"];
firstName = nameParts.length > 1 ? nameParts[1] : nameParts[0];
generateTiles();
return Scaffold(
body: Padding(
padding: const EdgeInsets.only(top: 12.0),
child: NestedScrollView(
physics: const BouncingScrollPhysics(
parent: AlwaysScrollableScrollPhysics()),
headerSliverBuilder: (context, _) => [
SliverAppBar(
pinned: true,
floating: false,
snap: false,
centerTitle: false,
surfaceTintColor: Theme.of(context).scaffoldBackgroundColor,
actions: [
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16.0, vertical: 5.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
GestureDetector(
onTap: () async {
SoonAlert.show(context: context);
},
child: Icon(
FeatherIcons.search,
color: AppColors.of(context).text,
size: 22.0,
),
),
const SizedBox(
width: 12.0,
),
GestureDetector(
onTap: () async {
// 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()));
},
child: Icon(
FeatherIcons.plus,
color: AppColors.of(context).text,
),
),
],
),
),
// Profile Icon
Padding(
padding: const EdgeInsets.only(right: 24.0),
child: ProfileButton(
child: ProfileImage(
heroTag: "profile",
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
.secondary, //ColorUtils.stringToColor(user.displayName ?? "?"),
badge: updateProvider.available,
role: user.role,
profilePictureString: user.picture,
),
),
),
],
automaticallyImplyLeading: false,
shadowColor: Theme.of(context).shadowColor,
title: Padding(
padding: const EdgeInsets.only(left: 8.0),
child: Text(
"notes".i18n,
style: TextStyle(
color: AppColors.of(context).text,
fontSize: 32.0,
fontWeight: FontWeight.bold),
),
),
),
],
body: RefreshIndicator(
onRefresh: () {
var state = Provider.of<HomeworkProvider>(context, listen: false)
.fetch(
from: DateTime.now().subtract(const Duration(days: 30)));
Provider.of<SelfNoteProvider>(context, listen: false).restore();
generateTiles();
return state;
},
color: Theme.of(context).colorScheme.secondary,
child: ListView.builder(
padding: EdgeInsets.zero,
physics: const BouncingScrollPhysics(),
itemCount: max(noteTiles.length, 1),
itemBuilder: (context, index) {
if (noteTiles.isNotEmpty) {
const EdgeInsetsGeometry panelPadding =
EdgeInsets.symmetric(horizontal: 24.0);
return Padding(
padding: panelPadding, child: noteTiles[index]);
} else {
return Container();
}
},
),
),
),
),
);
}
}

45
refilc_mobile_ui/lib/pages/notes/notes_page.i18n.dart Normal file
View File

@@ -0,0 +1,45 @@
import 'package:i18n_extension/i18n_extension.dart';
extension ScreensLocalization on String {
static final _t = Translations.byLocale("hu_hu") +
{
"en_en": {
"notes": "Notes",
"empty": "You don't have any notes",
"todo": "Tasks",
"homework": "Homework",
"new_note": "New Note",
"edit_note": "Edit Note",
"hint": "Note content...",
"hint_t": "Note title...",
"your_notes": "Your Notes",
},
"hu_hu": {
"notes": "Füzet",
"empty": "Nincsenek jegyzeteid",
"todo": "Feladatok",
"homework": "Házi feladat",
"new_note": "Új jegyzet",
"edit_note": "Jegyzet szerkesztése",
"hint": "Jegyzet tartalma...",
"hint_t": "Jegyzet címe...",
"your_notes": "Jegyzeteid",
},
"de_de": {
"notes": "Broschüre",
"empty": "Sie haben keine Notizen",
"todo": "Aufgaben",
"homework": "Hausaufgaben",
"new_note": "Neue Notiz",
"edit_note": "Notiz bearbeiten",
"hint": "Inhalt beachten...",
"hint_t": "Titel notieren...",
"your_notes": "Deine Noten",
},
};
String get i18n => localize(this, _t);
String fill(List<Object> params) => localizeFill(this, params);
String plural(int value) => localizePlural(value, this, _t);
String version(Object modifier) => localizeVersion(modifier, this, _t);
}

4
refilc_mobile_ui/lib/pages/timetable/timetable_page.dart
View File

@@ -271,7 +271,7 @@ class TimetablePageState extends State<TimetablePage>
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
.primary, //ColorUtils.stringToColor(user.displayName ?? "?"),
.secondary, //ColorUtils.stringToColor(user.displayName ?? "?"),
badge: updateProvider.available,
role: user.role,
profilePictureString: user.picture,
@@ -523,7 +523,7 @@ class TimetablePageState extends State<TimetablePage>
border: Border.all(
color: Theme.of(context)
.colorScheme
.primary
.secondary
.withOpacity(0.25),
),
borderRadius:

16
refilc_mobile_ui/lib/premium/components/active_sponsor_card.dart
View File

@@ -24,7 +24,7 @@ class ActiveSponsorCard extends StatelessWidget {
return PremiumFeatureLevel.old;
}
IconData _levelIcon(PremiumFeatureLevel level) {
IconData? _levelIcon(PremiumFeatureLevel level) {
switch (level) {
case PremiumFeatureLevel.cap:
return FilcIcons.kupak;
@@ -34,6 +34,11 @@ class ActiveSponsorCard extends StatelessWidget {
return FilcIcons.kupak;
case PremiumFeatureLevel.old:
return FilcIcons.kupak;
case PremiumFeatureLevel.basic:
return FilcIcons.kupak;
case PremiumFeatureLevel.gold:
return FilcIcons.kupak;
}
}
@@ -46,7 +51,7 @@ class ActiveSponsorCard extends StatelessWidget {
return const SizedBox();
}
Color glow;
Color? glow = Colors.white; //TODO: only temp fix kima
switch (level) {
case PremiumFeatureLevel.cap:
@@ -61,8 +66,13 @@ class ActiveSponsorCard extends StatelessWidget {
case PremiumFeatureLevel.old:
glow = Colors.red;
break;
case PremiumFeatureLevel.basic:
glow = Colors.red;
break;
case PremiumFeatureLevel.gold:
glow = Colors.red;
break;
}
return Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20.0),

91
refilc_mobile_ui/lib/premium/components/github_button.dart
View File

@@ -1,8 +1,7 @@
import 'package:flutter_stripe/flutter_stripe.dart' as stripe;
import 'package:refilc/api/client.dart';
import 'package:refilc/theme/colors/colors.dart';
// import 'package:refilc/api/client.dart';
// import 'package:refilc/theme/colors/colors.dart';
import 'package:refilc_plus/providers/premium_provider.dart';
import 'package:refilc_plus/ui/mobile/premium/activation_view/activation_view.dart';
// import 'package:refilc_plus/ui/mobile/premium/activation_view/activation_view.dart';
import 'package:flutter/material.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:flutter_svg/svg.dart';
@@ -128,49 +127,49 @@ class GithubLoginButton extends StatelessWidget {
);
}
Future<bool> initPaymentSheet(BuildContext context) async {
try {
// 1. create payment intent on the server
final data = await _createPaymentSheet();
// Future<bool> initPaymentSheet(BuildContext context) async {
// try {
// // 1. create payment intent on the server
// final data = await _createPaymentSheet();
if (data == null) {
throw "API error, can't create payment sheet!";
}
// if (data == null) {
// throw "API error, can't create payment sheet!";
// }
// 2. initialize the payment sheet
await stripe.Stripe.instance.initPaymentSheet(
paymentSheetParameters: stripe.SetupPaymentSheetParameters(
// Set to true for custom flow
customFlow: false,
// Main params
merchantDisplayName: 'reFilc',
paymentIntentClientSecret: data['paymentIntent'],
// Customer keys
customerEphemeralKeySecret: data['ephemeralKey'],
customerId: data['customer'],
// Extra options
// applePay: const stripe.PaymentSheetApplePay(
// merchantCountryCode: 'HU',
// ),
googlePay: const stripe.PaymentSheetGooglePay(
merchantCountryCode: 'HU',
testEnv: true,
),
style: ThemeMode.system,
),
);
return true;
} catch (e) {
// ignore: use_build_context_synchronously
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Error: $e')),
);
rethrow;
}
}
// // 2. initialize the payment sheet
// await stripe.Stripe.instance.initPaymentSheet(
// paymentSheetParameters: stripe.SetupPaymentSheetParameters(
// // Set to true for custom flow
// customFlow: false,
// // Main params
// merchantDisplayName: 'reFilc',
// paymentIntentClientSecret: data['paymentIntent'],
// // Customer keys
// customerEphemeralKeySecret: data['ephemeralKey'],
// customerId: data['customer'],
// // Extra options
// // applePay: const stripe.PaymentSheetApplePay(
// // merchantCountryCode: 'HU',
// // ),
// googlePay: const stripe.PaymentSheetGooglePay(
// merchantCountryCode: 'HU',
// testEnv: true,
// ),
// style: ThemeMode.system,
// ),
// );
// return true;
// } catch (e) {
// // ignore: use_build_context_synchronously
// ScaffoldMessenger.of(context).showSnackBar(
// SnackBar(content: Text('Error: $e')),
// );
// rethrow;
// }
// }
Future<Map?> _createPaymentSheet() async {
Map? data = await FilcAPI.createPaymentSheet("refilcplus");
return data;
}
// Future<Map?> _createPaymentSheet() async {
// Map? data = await FilcAPI.createPaymentSheet("refilcplus");
// return data;
// }
}

2
refilc_mobile_ui/lib/premium/components/github_connect_button.dart
View File

@@ -1,6 +1,6 @@
import 'package:refilc/theme/colors/colors.dart';
import 'package:refilc_plus/providers/premium_provider.dart';
import 'package:refilc_plus/ui/mobile/premium/activation_view/activation_view.dart';
// import 'package:refilc_plus/ui/mobile/premium/activation_view/activation_view.dart';
import 'package:flutter/material.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:flutter_svg/svg.dart';

23
refilc_mobile_ui/lib/premium/components/plan_card.dart
View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:refilc_plus/providers/premium_provider.dart';
import 'package:refilc_plus/ui/mobile/premium/activation_view/activation_view.dart';
import 'package:refilc_mobile_ui/premium/plus_screen.i18n.dart';
import 'package:url_launcher/url_launcher.dart';
class PlusPlanCard extends StatelessWidget {
@@ -115,7 +116,7 @@ class PlusPlanCard extends StatelessWidget {
horizontal: 8.0, vertical: 0.0),
child: Text(
active
? 'Aktív'
? 'active'.i18n
: '${price.toStringAsFixed(2).replaceAll('.', ',')} €',
style: const TextStyle(
fontSize: 16.6,
@@ -172,12 +173,12 @@ class PlusPlanCard extends StatelessWidget {
),
TextSpan(
children: [
const TextSpan(
text: 'Minden ',
TextSpan(
text: 'every'.i18n,
),
e[1].startsWith('cap')
? const TextSpan(
text: 'Kupak',
text: 'reFilc+',
style: TextStyle(
color:
Color(0xFF47BB00),
@@ -185,10 +186,10 @@ class PlusPlanCard extends StatelessWidget {
FontWeight.w600,
),
)
: const TextSpan(
: TextSpan(
children: [
TextSpan(
text: 'Kupak',
const TextSpan(
text: 'reFilc+',
style: TextStyle(
color: Color(
0xFF47BB00),
@@ -197,10 +198,10 @@ class PlusPlanCard extends StatelessWidget {
),
),
TextSpan(
text: ' és ',
text: 'and'.i18n,
),
TextSpan(
text: 'Tinta',
const TextSpan(
text: 'reFilc+ Gold',
style: TextStyle(
color: Color(
0xFF0061BB),
@@ -210,7 +211,7 @@ class PlusPlanCard extends StatelessWidget {
),
],
),
const TextSpan(text: ' előny'),
TextSpan(text: 'benefit'.i18n),
],
),
)

48
refilc_mobile_ui/lib/premium/plus_screen.dart
View File

@@ -35,11 +35,11 @@ class PlusScreen extends StatelessWidget {
decoration: BoxDecoration(
gradient: LinearGradient(
colors: [
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),
const Color(0xffF4F9FF).withOpacity(0.30),
const Color(0xffF4F9FF).withOpacity(0.40),
const Color(0xffF4F9FF).withOpacity(0.50),
const Color(0xffF4F9FF).withOpacity(0.60),
const Color(0xffF4F9FF).withOpacity(0.70),
],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
@@ -53,8 +53,8 @@ class PlusScreen extends StatelessWidget {
gradient: LinearGradient(
colors: [
const Color(0xffF4F9FF).withOpacity(0.0),
const Color(0xffF4F9FF).withOpacity(0.4),
const Color(0xffF4F9FF).withOpacity(0.6),
const Color(0xffF4F9FF).withOpacity(0.7),
const Color(0xffF4F9FF).withOpacity(0.8),
const Color(0xffF4F9FF).withOpacity(0.9),
const Color(0xffF4F9FF),
],
@@ -174,14 +174,13 @@ class PlusScreen extends StatelessWidget {
borderRadius: const BorderRadius.vertical(
top: Radius.circular(16.0),
bottom: Radius.circular(8.0)),
features: const [
['✨', 'Előzetes hozzáférés új verziókhoz'],
['👥', '2 fiók használata egyszerre'],
['👋', 'Egyedi üdvözlő üzenet'],
[
'📓',
'Korlátlan saját jegyzet és feladat a füzet oldalon'
],
features: [
['✨', 'rfp_1'.i18n],
['1️⃣', 'rfp_5'.i18n],
// ['👥', 'rfp_2'.i18n],
['👋', 'rfp_3'.i18n],
['📓', 'rfp_4'.i18n],
['🎓', 'rfp_6'.i18n],
],
),
const SizedBox(
@@ -200,12 +199,16 @@ class PlusScreen extends StatelessWidget {
borderRadius: const BorderRadius.vertical(
top: Radius.circular(8.0),
bottom: Radius.circular(16.0)),
features: const [
['🕑', 'Órarend jegyzetek'],
['👥', '5 fiók használata egyszerre'],
['🎓', 'Összesített átlagszámoló'],
['🟦', 'Live Activity szín'],
['🖋️', 'cap_tier_benefits'],
features: [
['🕑', 'rfp_7'.i18n],
['🔤', 'rfp_8'.i18n],
// ['👥', 'rfp_9'.i18n],
// ['🎓', 'Összesített átlagszámoló'],
['📱', 'rfp_10'.i18n],
['🟦', 'rfp_11'.i18n],
['📒', 'rfp_12'.i18n],
['📅', 'rfp_13'.i18n],
const ['🖋️', 'cap_tier_benefits'],
],
),
// const SizedBox(
@@ -226,10 +229,7 @@ class PlusScreen extends StatelessWidget {
// top: Radius.circular(8.0),
// bottom: Radius.circular(16.0)),
// features: const [
// ['📱', 'Alkalmazás ikonjának megváltoztatása'],
// ['👥', 'Korlátlan fiók használata egyszerre'],
// ['📒', 'Fejlettebb cél kitűzés'],
// ['🔤', 'Egyedi betütípusok'],
// ['🖋️', 'ink_cap_tier_benefits'],
// ],
// ),

116
refilc_mobile_ui/lib/premium/plus_screen.i18n.dart
View File

@@ -3,7 +3,52 @@ import 'package:i18n_extension/i18n_extension.dart';
extension SettingsLocalization on String {
static final _t = Translations.byLocale("hu_hu") +
{
"en_en": {},
"en_en": {
"even_more_cheaper": "More reFilc, cheaper\nthan anything else!",
"support_1": "Support QwIT",
"support_2": " and get useful features in return!",
"tier_rfp": "More customisation, more accounts, easier notes.",
"tier_rfpgold":
"Get access to more features, add multiple profiles, and make your day better and simpler.",
"faq": "FAQ",
"money": "What will you spend my money on?",
"m_1":
"We will spend the money from our supporters on the \$100 fee of the Apple",
"m_2":
" Developer Program, our servers, and the reFilc domains. The remaining money will be spent on other development stuff, and pizza parties.",
"open": "Will reFilc stay open-source?",
"o_1":
"Yes, reFilc is, and always will be, open-source. Subscribers can ask for the source code of reFilc+ on our Discord server.",
"desc": "Explanations",
"cheaper":
"The lowest tier of service is cheaper than most known subscriptions, but there may be exceptions.",
"qwit":
"\"QwIT\" is an abbreviation of \"QwIT Development\", the development team behind reFilc and other projects.",
"apple": "\"Apple\" is a trademark of Apple Inc.",
"eur":
"Prices are displayed in euros, which means it's dependant on the exchange rate. 1 EUR ≈ 390 HUF",
"active": "Active",
// benefits
"rfp_1": "Early access to updates",
"rfp_2": "Use two accounts simaltaneously",
"rfp_3": "Custom welcome message",
"rfp_4": "Unlimited custom notes and tasks on the Notebook page",
"rfp_5": "Custom grade rarities",
"rfp_6": "Overall average calculator",
"rfp_7": "Timetable notes",
"rfp_8": "Custom font types",
"rfp_9": "Unlimited accounts",
"rfp_10": "Custom app icon",
"rfp_11": "Change Live Activity color",
"rfp_12": "Better goal planner",
"rfp_13": "Import your timetable into your calendar app",
"rfp_14": "",
"rfp_15": "",
// other
"and": " and ",
"every": "Every ",
"benefit": " benefit",
},
"hu_hu": {
"even_more_cheaper": "Még több reFilc, olcsóbban,\nmint bármi más!",
"support_1": "Támogasd a QwIT",
@@ -28,8 +73,75 @@ extension SettingsLocalization on String {
"apple": "Az \"Apple\" az Apple Inc. védjegye.",
"eur":
"Az árak euróban vannak feltüntetve, így az árfolyam befolyásolja, hogy mennyit kell fizetned a szolgáltatásért. 1 EUR ≈ 390 Ft",
"active": "Aktív",
// benefits
"rfp_1": "Előzetes hozzáférés új verziókhoz",
"rfp_2": "2 fiók használata egyszerre",
"rfp_3": "Egyedi üdvözlő üzenet",
"rfp_4": "Korlátlan saját jegyzet és feladat a füzet oldalon",
"rfp_5": "Egyedi jegy ritkaságok",
"rfp_6": "Összesített átlagszámoló",
"rfp_7": "Órarend jegyzetek",
"rfp_8": "Egyedi betütípusok",
"rfp_9": "Korlátlan fiók használata egyszerre",
"rfp_10": "Alkalmazás ikonjának megváltoztatása",
"rfp_11": "Live Activity szín",
"rfp_12": "Fejlettebb cél kitűzés",
"rfp_13": "Naptár szinkronizálás",
"rfp_14": "",
"rfp_15": "",
// other
"and": " és ",
"every": "Minden ",
"benefit": " előny",
},
"de_de": {
"even_more_cheaper": "Mehr reFilc, günstiger\nals alles andere!",
"support_1": "Unterstütze QwIT",
"support_2": " und du kriegst mehr nützliche Features!",
"tier_rfp":
"Mehr Personalisierung, mehr Profile, einfachere Notizen.",
"tier_rfpgold":
"Hol dir mehr Features, füge mehrere Profile hinzu und mach damit dein Alltag einfacher.",
"faq": "Häufig gestellte Fragen (FAQ)",
"money": "Was tun wir mit deinem Geld?",
"m_1":
"Wir verwenden das gesammelte Geld von unseren Sponsoren ausschließlich auf die \$100 Gebühr von dem Apple",
"m_2":
" Developer Program, unsere Server und die reFilc Domänen. Das restliche Geld wird auf andere Entwicklungsbezogene Dinge und auch Pizza Parties bezweckt.",
"open": "Wird reFilc Open-Source bleiben?",
"o_1":
"Ja, reFilc ist und bleibt weiterhin ein Open-Source Projekt. Abonnenten des reFilc+ Abos können auch natürlich den Quellcode dieser Version in unserem Discord Server finden.",
"desc": "Erklärung/Aufklärung",
"cheaper":
"Das günstigste Abonnement ist das beliebteste, es gibt natürlich aber auch ausnahmen.",
"qwit":
"\"QwIT\" ist ein Teil of \"QwIT Development\", die Entwickler hinter des Programms reFilc.",
"apple": "\"Apple\" ist eine geschützte Marke von Apple Inc.",
"eur":
"Der Preis wird in Euro angegeben im Bezug zum aktuellen Wechselkurs. 1 EUR ≈ 390 HUF",
"active": "Aktiv",
// benefits
"rfp_1": "Előzetes hozzáférés új verziókhoz",
"rfp_2": "2 fiók használata egyszerre",
"rfp_3": "Egyedi üdvözlő üzenet",
"rfp_4": "Korlátlan saját jegyzet és feladat a füzet oldalon",
"rfp_5": "Egyedi jegy ritkaságok",
"rfp_6": "Összesített átlagszámoló",
"rfp_7": "Órarend jegyzetek",
"rfp_8": "Egyedi betütípusok",
"rfp_9": "Korlátlan fiók használata egyszerre",
"rfp_10": "Alkalmazás ikonjának megváltoztatása",
"rfp_11": "Live Activity szín",
"rfp_12": "Fejlettebb cél kitűzés",
"rfp_13": "Naptár szinkronizálás",
"rfp_14": "",
"rfp_15": "",
// other
"and": " és ",
"every": "Minden ",
"benefit": " előny",
},
"de_de": {},
};
String get i18n => localize(this, _t);

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(() {});
},

1
refilc_mobile_ui/pubspec.yaml
View File

@@ -64,7 +64,6 @@ dependencies:
uuid: ^4.3.3
maps_launcher: ^2.2.0
google_fonts: ^6.1.0
flutter_stripe: ^10.0.0
flutter_any_logo: ^1.1.1
custom_sliding_segmented_control: ^1.8.1
get_it: ^7.6.7