From 4630c6d983c5bbcf1ffe5aa79e80648ac4dd1798 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Thu, 18 Aug 2022 13:23:39 +0200
Subject: [PATCH] improved UI

---
 lib/locale/l10n/app_de.arb       | 14 +++++++++++++-
 lib/locale/l10n/app_en.arb       |  4 ++--
 lib/screens/login_screen.dart    |  6 +++---
 lib/screens/settings_screen.dart | 27 +++++++++++++++++++++------
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/lib/locale/l10n/app_de.arb b/lib/locale/l10n/app_de.arb
index 11fe06f..2e3ef76 100644
--- a/lib/locale/l10n/app_de.arb
+++ b/lib/locale/l10n/app_de.arb
@@ -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"
 }
\ No newline at end of file
diff --git a/lib/locale/l10n/app_en.arb b/lib/locale/l10n/app_en.arb
index b5329f0..0332396 100644
--- a/lib/locale/l10n/app_en.arb
+++ b/lib/locale/l10n/app_en.arb
@@ -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"
 }
\ No newline at end of file
diff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dart
index 84784f9..0033392 100644
--- a/lib/screens/login_screen.dart
+++ b/lib/screens/login_screen.dart
@@ -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();
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 898e3eb..e82107e 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -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