Myzel394/quid_faciam_hodie
1
0
Fork 0
mirror of https://github.com/Myzel394/quid_faciam_hodie.git synced 2025-06-18 23:35:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

improved UI

Browse Source
This commit is contained in:
Myzel394 2022-08-18 13:23:39 +02:00
parent 72c3e356ae
commit 4630c6d983
4 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/locale/l10n/app_de.arb
View File

@ -29,6 +29,7 @@
"loginScreenFormEmailLabel": "E-Mail",
"loginScreenFormPasswordLabel": "Passwort",
"loginScreenFormSubmitButton": "Anmelden",
"loginScreenLoginFailed": "E-Mail oder Passwort inkorrekt",
"grantPermissionScreenTitle": "Berechtigungen erteilen",
@ -59,5 +60,16 @@
"emptyScreenSubtitle": "Der Benutzer hat noch keine Erinnerungen erstellt!",
"emptyScreenDescription": "Um deinen Zeitstrahl sehen zu können musst du zuerst ein paar Erinnerungen erstellen! :)",
"emptyScreenCreateMemory": "Erinnerung erstellen",
"memorySheetCreatedAtDataKey": "Erstellt am: {creationTimeFormatted}"
"memorySheetCreatedAtDataKey": "Erstellt am: {creationTimeFormatted}",
"settingsScreenLoading": "Einstellungen werden geladen...",
"settingsScreenTitle": "Einstellungen",
"settingsScreenAccountSectionTitle": "Dein Account",
"settingsScreenAccountSectionCreationDateLabel": "Account-Erstellung",
"settingsScreenAccountSectionLogoutLabel": "Abmelden",
"settingsScreenDangerSectionTitle": "Gefahrbereich",
"settingsScreenDangerSectionDeleteAccountLabel": "Account löschen",
"settingsScreenDeleteAccountDescription": "Bist du dir sicher, dass du deinen Account löschen möchtest? Diese Aktion kann nicht rückgangig gemacht werden! Deine Erfahrungen werden ebenfalls gelöscht.",
"settingsScreenDeleteAccountConfirmLabel": "Account jetzt löschen"
}

4
lib/locale/l10n/app_en.arb
View File

@ -30,6 +30,7 @@
"loginScreenFormEmailLabel": "Email",
"loginScreenFormPasswordLabel": "Password",
"loginScreenFormSubmitButton": "Login",
"loginScreenLoginFailed": "Email or password incorrect",
"grantPermissionScreenTitle": "Grant Permissions",
@ -75,11 +76,10 @@
"settingsScreenLoading": "Loading Settings...",
"settingsScreenTitle": "Settings",
"settingsScreenAccountSectionTitle": "Your Account",
"settingsScreenAccountSectionCreationDateLabel": "Created at",
"settingsScreenAccountSectionCreationDateLabel": "Account creation",
"settingsScreenAccountSectionLogoutLabel": "Log out",
"settingsScreenDangerSectionTitle": "Danger Zone",
"settingsScreenDangerSectionDeleteAccountLabel": "Delete Account",
"settingsScreenDeleteAccountTitle": "Delete Account",
"settingsScreenDeleteAccountDescription": "Are you sure you want to delete your account? This action cannot be undone! All your memories will be deleted as well.",
"settingsScreenDeleteAccountConfirmLabel": "Delete Account now"
}

6
lib/screens/login_screen.dart
View File

@ -63,14 +63,14 @@ class _LoginScreenState extends AuthState<LoginScreen> with Loadable {
final localizations = AppLocalizations.of(context)!;
try {
await _signUp();
await _signIn();
} catch (error) {
try {
await _signIn();
await _signUp();
} catch (error) {
if (mounted) {
context.showLongErrorSnackBar(
message: localizations.generalError,
message: localizations.loginScreenLoginFailed,
);
emailController.clear();

27
lib/screens/settings_screen.dart
View File

@ -92,11 +92,25 @@ class _SettingsScreenState extends AuthRequiredState<SettingsScreen>
title: Text(user!.email!),
),
SettingsTile(
leading: Text(localizations
.settingsScreenAccountSectionCreationDateLabel),
title: Text(
DateFormat('d. MMMM y, HH:mm:ss')
.format(DateTime.parse(user!.createdAt)),
leading: Icon(context.platformIcons.time),
title: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
DateFormat('d. MMMM y, HH:mm:ss')
.format(DateTime.parse(user!.createdAt)),
),
const SizedBox(height: SMALL_SPACE),
Text(
localizations
.settingsScreenAccountSectionCreationDateLabel,
style: platformThemeData(
context,
material: (data) => data.textTheme.bodySmall,
cupertino: (data) => data.textTheme.textStyle,
),
)
],
),
),
SettingsTile(
@ -130,7 +144,8 @@ class _SettingsScreenState extends AuthRequiredState<SettingsScreen>
context: context,
builder: (platformContext) => PlatformAlertDialog(
title: Text(
localizations.settingsScreenDeleteAccountTitle,
localizations
.settingsScreenDangerSectionDeleteAccountLabel,
),
content: Text(
localizations