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

Merge branch 'dev' of github.com:refilc/naplo into dev

Browse Source
This commit is contained in:
Kima
2024-03-03 23:33:11 +01:00
parent c1965e2453 28d39375ba
commit 6eff27d4d8
34 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,26 +21,24 @@ class ErrorReportScreen extends StatelessWidget {
child: Column(
children: [
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,
),
@@ -50,7 +48,7 @@ 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(
@@ -86,13 +84,14 @@ 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)),
const EdgeInsets.symmetric(vertical: 10.0)),
backgroundColor:
MaterialStateProperty.all(const Color(0xFF0E275A)),
shape: MaterialStateProperty.all(
@@ -114,17 +113,22 @@ class ErrorReportScreen extends StatelessWidget {
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)),
foregroundColor:
MaterialStateProperty.all(const Color(0xFFC7D3EB)),
const EdgeInsets.symmetric(vertical: 14.0),
),
backgroundColor: MaterialStateProperty.all(
Color(0xFFF3F7FE),
),
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12.0)),
borderRadius: BorderRadius.circular(12.0),
),
),
side: MaterialStateProperty.all(
BorderSide(width: 1.0, color: Color(0xFFC7D3EB)),
),
),
child: Text(
@@ -154,7 +158,7 @@ class ErrorReportScreen extends StatelessWidget {
version: const String.fromEnvironment("APPVER", defaultValue: "?"),
stack: details.stack.toString(),
);
FilcAPI.sendReport(report);
reFilcAPI.sendReport(report);
Navigator.pop(context);
}
}
@@ -240,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)),
))
],
),

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

@@ -4,7 +4,7 @@ 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",
@@ -16,8 +16,8 @@ extension SettingsLocalization on String {
"done": "Done",
},
"hu_hu": {
"uhoh": "Ajajj!",
"description": "Hiba történt!",
"ekretaYou": "eKréta, te",
"description": "Fasz-emulátor hivatásos balfasz!",
"submit": "Hiba jelentése",
"goback": "Vissza",
"details": "Részletek",
@@ -28,7 +28,7 @@ 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",

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

@@ -57,7 +57,7 @@ class LoginScreenState extends State<LoginScreen> {
systemNavigationBarIconBrightness: Brightness.dark,
));
FilcAPI.getSchools().then((schools) {
reFilcAPI.getSchools().then((schools) {
if (schools != null) {
schoolController.update(() {
schoolController.schools = schools;