diff --git a/refilc/assets/fonts/Geist/Geist-Black.otf b/refilc/assets/fonts/Geist/Geist-Black.otf deleted file mode 100644 index 4f9a84e..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Black.otf and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-Black.woff2 b/refilc/assets/fonts/Geist/Geist-Black.woff2 deleted file mode 100644 index c8230cb..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Black.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-Bold.otf b/refilc/assets/fonts/Geist/Geist-Bold.otf deleted file mode 100644 index 928753b..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Bold.otf and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-Bold.woff2 b/refilc/assets/fonts/Geist/Geist-Bold.woff2 deleted file mode 100644 index d0562e4..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Bold.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-Light.otf b/refilc/assets/fonts/Geist/Geist-Light.otf deleted file mode 100644 index 6e01995..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Light.otf and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-Light.woff2 b/refilc/assets/fonts/Geist/Geist-Light.woff2 deleted file mode 100644 index 5661120..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Light.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-Medium.otf b/refilc/assets/fonts/Geist/Geist-Medium.otf deleted file mode 100644 index 82fa9cf..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Medium.otf and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-Medium.woff2 b/refilc/assets/fonts/Geist/Geist-Medium.woff2 deleted file mode 100644 index 76edd10..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Medium.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-Regular.otf b/refilc/assets/fonts/Geist/Geist-Regular.otf deleted file mode 100644 index 6deee3d..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Regular.otf and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-Regular.woff2 b/refilc/assets/fonts/Geist/Geist-Regular.woff2 deleted file mode 100644 index 2ebd009..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Regular.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-SemiBold.otf b/refilc/assets/fonts/Geist/Geist-SemiBold.otf deleted file mode 100644 index 1effc99..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-SemiBold.otf and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-SemiBold.woff2 b/refilc/assets/fonts/Geist/Geist-SemiBold.woff2 deleted file mode 100644 index a6c53e8..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-SemiBold.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-Thin.otf b/refilc/assets/fonts/Geist/Geist-Thin.otf deleted file mode 100644 index a8f8527..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Thin.otf and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-Thin.woff2 b/refilc/assets/fonts/Geist/Geist-Thin.woff2 deleted file mode 100644 index a330c07..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-Thin.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-UltraBlack.otf b/refilc/assets/fonts/Geist/Geist-UltraBlack.otf deleted file mode 100644 index 212c0d7..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-UltraBlack.otf and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-UltraBlack.woff2 b/refilc/assets/fonts/Geist/Geist-UltraBlack.woff2 deleted file mode 100644 index 198caea..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-UltraBlack.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-UltraLight.otf b/refilc/assets/fonts/Geist/Geist-UltraLight.otf deleted file mode 100644 index febc814..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-UltraLight.otf and /dev/null differ diff --git a/refilc/assets/fonts/Geist/Geist-UltraLight.woff2 b/refilc/assets/fonts/Geist/Geist-UltraLight.woff2 deleted file mode 100644 index 5416852..0000000 Binary files a/refilc/assets/fonts/Geist/Geist-UltraLight.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/Geist/GeistVariableVF.ttf b/refilc/assets/fonts/Geist/GeistVariableVF.ttf deleted file mode 100644 index 3bf8230..0000000 Binary files a/refilc/assets/fonts/Geist/GeistVariableVF.ttf and /dev/null differ diff --git a/refilc/assets/fonts/Geist/GeistVariableVF.woff2 b/refilc/assets/fonts/Geist/GeistVariableVF.woff2 deleted file mode 100644 index 328a020..0000000 Binary files a/refilc/assets/fonts/Geist/GeistVariableVF.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/Geist/LICENSE.TXT b/refilc/assets/fonts/Geist/LICENSE.TXT deleted file mode 100644 index df71062..0000000 --- a/refilc/assets/fonts/Geist/LICENSE.TXT +++ /dev/null @@ -1,92 +0,0 @@ -Geist Sans and Geist Mono Font -(C) 2023 Vercel, made in collaboration with basement.studio - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is available with a FAQ at: http://scripts.sil.org/OFL and copied below - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION AND CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/refilc/assets/fonts/GeistMono/GeistMono-Black.otf b/refilc/assets/fonts/GeistMono/GeistMono-Black.otf deleted file mode 100644 index 8fc2661..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-Black.otf and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-Black.woff2 b/refilc/assets/fonts/GeistMono/GeistMono-Black.woff2 deleted file mode 100644 index 3bbcc0c..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-Black.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-Bold.otf b/refilc/assets/fonts/GeistMono/GeistMono-Bold.otf deleted file mode 100644 index 73f0b4a..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-Bold.otf and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-Bold.woff2 b/refilc/assets/fonts/GeistMono/GeistMono-Bold.woff2 deleted file mode 100644 index 854b75a..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-Bold.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-Light.otf b/refilc/assets/fonts/GeistMono/GeistMono-Light.otf deleted file mode 100644 index b552b20..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-Light.otf and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-Light.woff2 b/refilc/assets/fonts/GeistMono/GeistMono-Light.woff2 deleted file mode 100644 index 10457f3..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-Light.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-Medium.otf b/refilc/assets/fonts/GeistMono/GeistMono-Medium.otf deleted file mode 100644 index 99b4837..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-Medium.otf and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-Medium.woff2 b/refilc/assets/fonts/GeistMono/GeistMono-Medium.woff2 deleted file mode 100644 index aaf10d7..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-Medium.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-Regular.woff2 b/refilc/assets/fonts/GeistMono/GeistMono-Regular.woff2 deleted file mode 100644 index 1603e0e..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-Regular.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-SemiBold.otf b/refilc/assets/fonts/GeistMono/GeistMono-SemiBold.otf deleted file mode 100644 index 3ab98ed..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-SemiBold.otf and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-SemiBold.woff2 b/refilc/assets/fonts/GeistMono/GeistMono-SemiBold.woff2 deleted file mode 100644 index d973a87..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-SemiBold.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-Thin.otf b/refilc/assets/fonts/GeistMono/GeistMono-Thin.otf deleted file mode 100644 index c66b1e2..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-Thin.otf and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-Thin.woff2 b/refilc/assets/fonts/GeistMono/GeistMono-Thin.woff2 deleted file mode 100644 index 649b16d..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-Thin.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-UltraBlack.otf b/refilc/assets/fonts/GeistMono/GeistMono-UltraBlack.otf deleted file mode 100644 index 319953b..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-UltraBlack.otf and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-UltraBlack.woff2 b/refilc/assets/fonts/GeistMono/GeistMono-UltraBlack.woff2 deleted file mode 100644 index fa6b9f9..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-UltraBlack.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-UltraLight.otf b/refilc/assets/fonts/GeistMono/GeistMono-UltraLight.otf deleted file mode 100644 index 6531a1e..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-UltraLight.otf and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMono-UltraLight.woff2 b/refilc/assets/fonts/GeistMono/GeistMono-UltraLight.woff2 deleted file mode 100644 index b13744e..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMono-UltraLight.woff2 and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMonoVariableVF.ttf b/refilc/assets/fonts/GeistMono/GeistMonoVariableVF.ttf deleted file mode 100644 index 252788e..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMonoVariableVF.ttf and /dev/null differ diff --git a/refilc/assets/fonts/GeistMono/GeistMonoVariableVF.woff2 b/refilc/assets/fonts/GeistMono/GeistMonoVariableVF.woff2 deleted file mode 100644 index dc6d198..0000000 Binary files a/refilc/assets/fonts/GeistMono/GeistMonoVariableVF.woff2 and /dev/null differ diff --git a/refilc/pubspec.yaml b/refilc/pubspec.yaml index 5caaa9c..d540f9a 100644 --- a/refilc/pubspec.yaml +++ b/refilc/pubspec.yaml @@ -154,24 +154,20 @@ flutter: weight: 100 style: italic - - family: SpaceMono - fonts: - - asset: assets/fonts/SpaceMono/SpaceMono-Regular.ttf - - asset: assets/fonts/SpaceMono/SpaceMono-Bold.ttf - weight: 700 - - asset: assets/fonts/SpaceMono/SpaceMono-Italic.ttf - style: italic - - asset: assets/fonts/SpaceMono/SpaceMono-BoldItalic.ttf - weight: 700 - style: italic + # - family: SpaceMono + # fonts: + # - asset: assets/fonts/SpaceMono/SpaceMono-Regular.ttf + # - asset: assets/fonts/SpaceMono/SpaceMono-Bold.ttf + # weight: 700 + # - asset: assets/fonts/SpaceMono/SpaceMono-Italic.ttf + # style: italic + # - asset: assets/fonts/SpaceMono/SpaceMono-BoldItalic.ttf + # weight: 700 + # style: italic - family: GeistMono fonts: - asset: assets/fonts/GeistMono/GeistMono-Regular.otf weight: 500 - - family: Geist - fonts: - - asset: assets/fonts/Geist/Geist-Regular.otf - weight: 500 diff --git a/refilc_mobile_ui/lib/screens/error_report_screen.dart b/refilc_mobile_ui/lib/screens/error_report_screen.dart index 3077400..c2e6623 100644 --- a/refilc_mobile_ui/lib/screens/error_report_screen.dart +++ b/refilc_mobile_ui/lib/screens/error_report_screen.dart @@ -17,7 +17,7 @@ class ErrorReportScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Theme.of(context).colorScheme.background, + backgroundColor: AppColors.of(context).background, body: SafeArea( child: Padding( padding: const EdgeInsets.all(12.0), @@ -66,7 +66,6 @@ class ErrorReportScreen extends StatelessWidget { color: AppColors.of(context).text, fontSize: 16.0, fontWeight: FontWeight.w500, - fontFamily: 'Geist', fontStyle: FontStyle.normal, ), ), @@ -80,28 +79,17 @@ class ErrorReportScreen extends StatelessWidget { padding: const EdgeInsets.all(12.0), decoration: BoxDecoration( borderRadius: BorderRadius.circular(12.0), - color: Colors.white.withOpacity( - Theme.of(context).brightness == Brightness.light - ? .35 - : .2), - boxShadow: [ - BoxShadow( - color: Colors.grey.withOpacity(0.2), - spreadRadius: 5, - blurRadius: 7, - offset: - const Offset(0, 3), // changes position of shadow - ), - ], + color: AppColors.of(context).highlight, ), child: SingleChildScrollView( physics: const BouncingScrollPhysics(), child: Text( details.exceptionAsString(), - style: const TextStyle( - fontFamily: 'GeistMono', - fontWeight: FontWeight.w500, - color: Color(0xFF011234)), + style: TextStyle( + fontFamily: 'GeistMono', + fontWeight: FontWeight.w500, + color: AppColors.of(context).text.withOpacity(0.9), + ), ), ), ), @@ -271,18 +259,19 @@ class ErrorDetail extends StatelessWidget { style: const TextStyle(fontWeight: FontWeight.bold), ), Container( - padding: - const EdgeInsets.symmetric(horizontal: 6.5, vertical: 4.0), - margin: const EdgeInsets.only(top: 4.0), - decoration: BoxDecoration( - color: const Color.fromARGB(255, 218, 218, 218), - borderRadius: BorderRadius.circular(4.0)), - child: Text( - content, - style: const TextStyle( - fontFamily: 'GeistMono', - color: Color.fromARGB(255, 0, 0, 0)), - )) + padding: const EdgeInsets.symmetric(horizontal: 6.5, vertical: 4.0), + margin: const EdgeInsets.only(top: 4.0), + decoration: BoxDecoration( + color: const Color.fromARGB(255, 218, 218, 218), + borderRadius: BorderRadius.circular(4.0)), + child: Text( + content, + style: const TextStyle( + fontFamily: 'GeistMono', + color: Color.fromARGB(255, 0, 0, 0), + ), + ), + ), ], ), ); diff --git a/refilc_mobile_ui/lib/screens/error_report_screen.i18n.dart b/refilc_mobile_ui/lib/screens/error_report_screen.i18n.dart index 697e2a6..ee30471 100644 --- a/refilc_mobile_ui/lib/screens/error_report_screen.i18n.dart +++ b/refilc_mobile_ui/lib/screens/error_report_screen.i18n.dart @@ -15,7 +15,7 @@ extension SettingsLocalization on String { "stack": "Stack Trace", "done": "Done", "smth_went_wrong": - "Something went wrong, it is of course the fault of Educational Development Informatikai Zrt. (e-KRÉTA) in any case! (Joke, our fault of course)", + "Something went wrong, it is of course the fault of Educational Development Informatikai Zrt. (e-KRÉTA) in any case! /s", }, "hu_hu": { "ekretaYou": "e-KRÉTA, te", @@ -29,7 +29,7 @@ extension SettingsLocalization on String { "stack": "Stacktrace", "done": "Kész", "smth_went_wrong": - "Valami probléma történt, ez természetesen az Educational Development Informatikai Zrt. (e-KRÉTA) hibája minden esetben! (Vicc, természetesen a mi hibánk)", + "Valami probléma történt, ez természetesen az Educational Development Informatikai Zrt. (e-KRÉTA) hibája minden esetben! /s", }, "de_de": { "ekretaYou": "e-KRÉTA, du", @@ -43,7 +43,7 @@ extension SettingsLocalization on String { "stack": "Stack Trace", "done": "Fertig", "smth_went_wrong": - "Irgendetwas ist schief gelaufen, es ist natürlich auf jeden Fall die Schuld der Educational Development Informatikai Zrt. (e-KRÉTA)! (Scherz, natürlich unsere Schuld)", + "Irgendetwas ist schief gelaufen, es ist natürlich auf jeden Fall die Schuld der Educational Development Informatikai Zrt. (e-KRÉTA)! /s", }, };