From 3a691ddda461e58ace87de9a18fd5f263bac5502 Mon Sep 17 00:00:00 2001 From: alexvasl Date: Mon, 29 May 2023 22:02:40 +0300 Subject: [PATCH] Corrections to the login screen --- lib.7z | Bin 0 -> 12761 bytes lib/pages/login_screen/login_screen.dart | 44 ++++++++++++++++++----- lib/theme/app_colors.dart | 23 +++++++++--- pubspec.yaml | 3 +- 4 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 lib.7z diff --git a/lib.7z b/lib.7z new file mode 100644 index 0000000000000000000000000000000000000000..89a64d6fe7866c36ff7a8b871ed4aff07274f0eb GIT binary patch literal 12761 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%0APNU~7r4^RS|{j`YW` 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 literal 0 HcmV?d00001 diff --git a/lib/pages/login_screen/login_screen.dart b/lib/pages/login_screen/login_screen.dart index b884f8b..47a6133 100644 --- a/lib/pages/login_screen/login_screen.dart +++ b/lib/pages/login_screen/login_screen.dart @@ -55,13 +55,13 @@ class LoginScreenState extends State { minHeight: 56, totalSwitches: 2, labels: ['Login', 'View only'], - activeBgColor: [AppColors.ToggleSwitchActiveBg], - activeFgColor: AppColors.ToggleSwitchTextActive, - inactiveBgColor: AppColors.ToggleSwitchBg, - inactiveFgColor: AppColors.ToggleSwitchTextInactive, + activeBgColor: [AppColors.toggleSwitchActiveBg], + activeFgColor: AppColors.toggleSwitchTextActive, + inactiveBgColor: AppColors.toggleSwitchBg, + inactiveFgColor: AppColors.toggleSwitchTextInactive, activeBorders: [ Border.all( - color: AppColors.ToggleSwitchBg, + color: AppColors.toggleSwitchBg, width: 4, ), ], @@ -86,10 +86,35 @@ class LoginScreenState extends State { ), const SizedBox(height: 24), TextFormField( - decoration: const InputDecoration( - labelText: 'nsec... / hex...', - border: OutlineInputBorder(), - ), + decoration: InputDecoration( + filled: true, + fillColor: AppColors.textFieldDefaultBg, + labelText: 'nsec... / hex...', + labelStyle: + TextStyle(color: AppColors.textFieldDefaultText), + suffixIcon: Row( + mainAxisSize: MainAxisSize.min, + children: [ + IconButton( + icon: const Icon(Icons.paste), + color: AppColors.textFieldActiveIconTrail, + onPressed: () {}, + ), + IconButton( + icon: const Icon(Icons.qr_code_scanner), + color: AppColors.textFieldActiveIconTrail, + onPressed: () {}, + ), + ], + ), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(8), + borderSide: BorderSide( + width: 0, + style: BorderStyle.none, + ), + ), + iconColor: AppColors.textFieldDefaultIconTrail), controller: keyController, key: formKey, validator: (value) { @@ -209,6 +234,7 @@ abstract class Note { ), children: [ TextSpan( + style: TextStyle(color: AppColors.noteText), text: "Your private key starts with “nsec” or “hex” and gives your full access to your account. That means, if you log in using your private key, you will be able to make posts and send and receive private messages.\n\n" "Your public key starts with “npub” and gives your view-only access to account. If you log in using your public key, you won’t be able to make posts or access private messages, but you will be able to view your feed. Go to “View only” tab to log in via your public key.") diff --git a/lib/theme/app_colors.dart b/lib/theme/app_colors.dart index 02b7df1..c0141ef 100644 --- a/lib/theme/app_colors.dart +++ b/lib/theme/app_colors.dart @@ -29,10 +29,25 @@ abstract class AppColors { // ToggleSwitch - static const ToggleSwitchBg = Color(0xFFE2DFFF); - static const ToggleSwitchTextInactive = Color(0xFF837CA3); - static const ToggleSwitchActiveBg = Color(0xFFFCF8FF); - static const ToggleSwitchTextActive = Color(0xFF4F46F1); + static const toggleSwitchBg = Color(0xFFE2DFFF); + static const toggleSwitchTextInactive = Color(0xFF837CA3); + static const toggleSwitchActiveBg = Color(0xFFFCF8FF); + static const toggleSwitchTextActive = Color(0xFF4F46F1); + +// TextField + + static const textFieldDefaultBg = Color(0xFFFCF8FF); + static const textFieldDefaultIconLead = Color(0xFFC9BFFF); + static const textFieldDefaultIconTrail = Color(0xFF5D55F2); + static const textFieldDefaultText = Color(0xFF837CA3); + + static const textFieldActiveBg = Color(0xFFFFFCFF); + static const textFieldActiveIconLead = Color(0xFF5D55F2); + static const textFieldActiveIconTrail = Color(0xFF5D55F2); + static const textFieldActiveText = Color(0xFF252229); + static const textFieldActiveLabel = Color(0xFF5D55F2); + + static const noteText = Color(0xFF787680); static const mainDarkBlue = Color.fromRGBO(3, 37, 65, 1); static const mainLightBlue = Color.fromRGBO(48, 86, 117, 1); diff --git a/pubspec.yaml b/pubspec.yaml index 3fe36b7..9911b8c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -64,7 +64,8 @@ flutter: # To add assets to your application, add an assets section, like this: assets: - - assets/images/ + - assets/images/logo/welcome.png + # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see