main #2

Closed
ryleedavis wants to merge 8 commits from alexvasl/drifter_app:main into main
4 changed files with 56 additions and 14 deletions
Showing only changes of commit 3a691ddda4 - Show all commits

BIN
lib.7z Normal file

Binary file not shown.

View File

@ -55,13 +55,13 @@ class LoginScreenState extends State<LoginScreen> {
minHeight: 56, minHeight: 56,
totalSwitches: 2, totalSwitches: 2,
labels: ['Login', 'View only'], labels: ['Login', 'View only'],
activeBgColor: [AppColors.ToggleSwitchActiveBg], activeBgColor: [AppColors.toggleSwitchActiveBg],
activeFgColor: AppColors.ToggleSwitchTextActive, activeFgColor: AppColors.toggleSwitchTextActive,
inactiveBgColor: AppColors.ToggleSwitchBg, inactiveBgColor: AppColors.toggleSwitchBg,
inactiveFgColor: AppColors.ToggleSwitchTextInactive, inactiveFgColor: AppColors.toggleSwitchTextInactive,
activeBorders: [ activeBorders: [
Border.all( Border.all(
color: AppColors.ToggleSwitchBg, color: AppColors.toggleSwitchBg,
width: 4, width: 4,
), ),
], ],
@ -86,10 +86,35 @@ class LoginScreenState extends State<LoginScreen> {
), ),
const SizedBox(height: 24), const SizedBox(height: 24),
TextFormField( TextFormField(
decoration: const InputDecoration( decoration: InputDecoration(
labelText: 'nsec... / hex...', filled: true,
border: OutlineInputBorder(), fillColor: AppColors.textFieldDefaultBg,
), labelText: 'nsec... / hex...',
labelStyle:
TextStyle(color: AppColors.textFieldDefaultText),
suffixIcon: Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
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, controller: keyController,
key: formKey, key: formKey,
validator: (value) { validator: (value) {
@ -209,6 +234,7 @@ abstract class Note {
), ),
children: <TextSpan>[ children: <TextSpan>[
TextSpan( TextSpan(
style: TextStyle(color: AppColors.noteText),
text: 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 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 wont 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.") "Your public key starts with “npub” and gives your view-only access to account. If you log in using your public key, you wont 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.")

View File

@ -29,10 +29,25 @@ abstract class AppColors {
// ToggleSwitch // ToggleSwitch
static const ToggleSwitchBg = Color(0xFFE2DFFF); static const toggleSwitchBg = Color(0xFFE2DFFF);
static const ToggleSwitchTextInactive = Color(0xFF837CA3); static const toggleSwitchTextInactive = Color(0xFF837CA3);
static const ToggleSwitchActiveBg = Color(0xFFFCF8FF); static const toggleSwitchActiveBg = Color(0xFFFCF8FF);
static const ToggleSwitchTextActive = Color(0xFF4F46F1); 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 mainDarkBlue = Color.fromRGBO(3, 37, 65, 1);
static const mainLightBlue = Color.fromRGBO(48, 86, 117, 1); static const mainLightBlue = Color.fromRGBO(48, 86, 117, 1);

View File

@ -64,7 +64,8 @@ flutter:
# To add assets to your application, add an assets section, like this: # To add assets to your application, add an assets section, like this:
assets: assets:
- assets/images/ - assets/images/logo/welcome.png
# - images/a_dot_ham.jpeg # - images/a_dot_ham.jpeg
# An image asset can refer to one or more resolution-specific "variants", see # An image asset can refer to one or more resolution-specific "variants", see