firka/student-legacy
firka/student-legacy
8
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refilc:master' into master

Browse Source
This commit is contained in:
Tihanyi Marcell 2023-06-12 21:54:47 +02:00 committed by GitHub
commit ae4c4aa89c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart
View File

@ -458,13 +458,13 @@ class _SettingsScreenState extends State<SettingsScreen>
fontSize: 16.0, fontSize: 16.0,
), ),
), ),
SizedBox( const SizedBox(
width: 5, width: 5,
), ),
SizedBox( SizedBox(
height: 30, height: 30,
child: AnimatedContainer( child: AnimatedContainer(
duration: Duration(milliseconds: 200), duration: const Duration(milliseconds: 200),
child: Padding( child: Padding(
padding: padding:
const EdgeInsets.only(left: 10, right: 10), const EdgeInsets.only(left: 10, right: 10),
@ -482,8 +482,9 @@ class _SettingsScreenState extends State<SettingsScreen>
overflow: TextOverflow.ellipsis))), overflow: TextOverflow.ellipsis))),
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.of(context).filc.withOpacity( color: settings.notificationsEnabled
settings.notificationsEnabled ? 1.0 : .5), ? Theme.of(context).colorScheme.secondary
: AppColors.of(context).text.withOpacity(.25),
borderRadius: BorderRadius.circular(40)), borderRadius: BorderRadius.circular(40)),
), ),
) )
@ -912,7 +913,7 @@ class _SettingsScreenState extends State<SettingsScreen>
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
vertical: 12.0, horizontal: 24.0), vertical: 12.0, horizontal: 24.0),
child: Panel( child: Panel(
title: const Text("Developer Settings"), title: Text("devsettings".i18n),
child: Column( child: Column(
children: [ children: [
Material( Material(
@ -921,8 +922,8 @@ class _SettingsScreenState extends State<SettingsScreen>
contentPadding: const EdgeInsets.only(left: 12.0), contentPadding: const EdgeInsets.only(left: 12.0),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12.0)), borderRadius: BorderRadius.circular(12.0)),
title: const Text("Developer Mode", title: Text("devmode".i18n,
style: TextStyle(fontWeight: FontWeight.w500)), style: const TextStyle(fontWeight: FontWeight.w500)),
onChanged: (v) => onChanged: (v) =>
settings.update(developerMode: false), settings.update(developerMode: false),
value: settings.developerMode, value: settings.developerMode,
@ -931,7 +932,7 @@ class _SettingsScreenState extends State<SettingsScreen>
), ),
PanelButton( PanelButton(
leading: const Icon(FeatherIcons.copy), leading: const Icon(FeatherIcons.copy),
title: const Text("Copy JWT"), title: Text("copy_jwt".i18n),
onPressed: () => Clipboard.setData(ClipboardData( onPressed: () => Clipboard.setData(ClipboardData(
text: text:
Provider.of<KretaClient>(context, listen: false) Provider.of<KretaClient>(context, listen: false)
@ -998,13 +999,13 @@ class _SettingsScreenState extends State<SettingsScreen>
ScaffoldMessenger.of(context).showSnackBar(SnackBar( ScaffoldMessenger.of(context).showSnackBar(SnackBar(
duration: const Duration(milliseconds: 200), duration: const Duration(milliseconds: 200),
content: Text( content: Text(
"You are $devmodeCountdown taps away from Developer Mode."), "devmoretaps".i18n.fill([devmodeCountdown])),
)); ));
setState(() => devmodeCountdown--); setState(() => devmodeCountdown--);
} else if (devmodeCountdown == 0) { } else if (devmodeCountdown == 0) {
ScaffoldMessenger.of(context).showSnackBar(const SnackBar( ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text("Developer Mode successfully activated."), content: Text("devactivated".i18n),
)); ));
settings.update(developerMode: true); settings.update(developerMode: true);

15
filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart
View File

@ -66,6 +66,11 @@ extension SettingsLocalization on String {
"Adaptive Theme": "Adaptive Theme", "Adaptive Theme": "Adaptive Theme",
"presentation": "Presentation mode", "presentation": "Presentation mode",
"uwufymode": "UwU-fied mode (hungarian)", "uwufymode": "UwU-fied mode (hungarian)",
"devmoretaps": "You are %s taps away from Developer Mode.",
"devactivated": "Developer Mode successfully activated.",
"devsettings": "Developer Settings",
"devmode": "Developer Mode",
"copy_jwt": "Copy JWT",
}, },
"hu_hu": { "hu_hu": {
"personal_details": "Személyes információk", "personal_details": "Személyes információk",
@ -130,6 +135,11 @@ extension SettingsLocalization on String {
"Adaptive Theme": "Adaptív téma", "Adaptive Theme": "Adaptív téma",
"presentation": "Bemutató mód", "presentation": "Bemutató mód",
"uwufymode": "UwU mód (magyar)", "uwufymode": "UwU mód (magyar)",
"devmoretaps": "Még %s koppintásra vagy a Fejlesztői módtól.",
"devactivated": "Fejlesztői mód sikeresen aktiválva.",
"devsettings": "Fejlesztői Beállítások",
"devmode": "Fejlesztői mód",
"copy_jwt": "JWT másolása",
}, },
"de_de": { "de_de": {
"personal_details": "Persönliche Angaben", "personal_details": "Persönliche Angaben",
@ -193,6 +203,11 @@ extension SettingsLocalization on String {
"Adaptive Theme": "Adaptive Theme", "Adaptive Theme": "Adaptive Theme",
"presentation": "Präsentationsmodus", "presentation": "Präsentationsmodus",
"uwufymode": "UwU-Modus (ungarisch)", "uwufymode": "UwU-Modus (ungarisch)",
"devmoretaps": "Sie sind %s Taps vom Entwicklermodus entfernt.",
"devactivated": "Entwicklermodus erfolgreich aktiviert.",
"devsettings": "Entwickleroptionen",
"devmode": "Entwicklermodus",
"copy_jwt": "JWT kopieren",
}, },
}; };