diff --git a/lib.7z b/lib.7z new file mode 100644 index 0000000..89a64d6 Binary files /dev/null and b/lib.7z differ 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