lukas/notes
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

some color adjustments

Browse Source
This commit is contained in:
lukas-heiligenbrunner 2022-11-03 00:39:29 +01:00
parent c996d7fc7d
commit 019cd2dad0
6 changed files with 85 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/app.dart
View File

@ -33,7 +33,7 @@ class _AppState extends State<App> {
), ),
Expanded( Expanded(
child: Container( child: Container(
color: const Color(0xff0d0d0d), color: const Color(0xff000000),
child: _buildPage(), child: _buildPage(),
)) ))
], ],
@ -65,8 +65,8 @@ class _AppState extends State<App> {
).then((v) => notifier.loadAllNotes()); ).then((v) => notifier.loadAllNotes());
}, },
backgroundColor: const Color(0xff3f3f3f), backgroundColor: const Color(0xff3f3f3f),
child: child: const Icon(Icons.edit_calendar_outlined,
const Icon(Icons.edit_calendar_outlined, color: Colors.orange), color: Color(0xffff7300)),
), ),
); );
default: default:

6
lib/canvas/paint_controller.dart
View File

@ -43,8 +43,8 @@ class PaintController extends ChangeNotifier {
alpha /= (2 * pi * 2); alpha /= (2 * pi * 2);
alpha += .5; alpha += .5;
double thickness = basetickness * alpha; basetickness * alpha;
return thickness; return basetickness;
} }
void pointDownEvent(Offset offset, PointerDownEvent e) async { void pointDownEvent(Offset offset, PointerDownEvent e) async {
@ -60,7 +60,7 @@ class PaintController extends ChangeNotifier {
[Point(offset, _calcTiltedWidth(3.0, e.tilt))], [Point(offset, _calcTiltedWidth(3.0, e.tilt))],
strokeid, strokeid,
activePen == Pen.pen activePen == Pen.pen
? Colors.black26 ? const Color(0xFF444444)
: Colors.yellow.withOpacity(.5))); : Colors.yellow.withOpacity(.5)));
file.addStroke(strokeid); file.addStroke(strokeid);

7
lib/pages/all_notes_page.dart
View File

@ -18,7 +18,7 @@ class _AllNotesPageState extends State<AllNotesPage> {
return Column( return Column(
children: [ children: [
SizedBox( SizedBox(
height: 10 + MediaQuery.of(context).viewPadding.top, height: 25 + MediaQuery.of(context).viewPadding.top,
), ),
Row( Row(
children: [ children: [
@ -28,7 +28,7 @@ class _AllNotesPageState extends State<AllNotesPage> {
const Text( const Text(
'All notes', 'All notes',
style: TextStyle( style: TextStyle(
color: Color.fromRGBO(255, 255, 255, .85), fontSize: 22), color: Color.fromRGBO(255, 255, 255, .85), fontSize: 21),
), ),
Expanded(child: Container()), Expanded(child: Container()),
IconMaterialButton( IconMaterialButton(
@ -37,16 +37,19 @@ class _AllNotesPageState extends State<AllNotesPage> {
onPressed: () async { onPressed: () async {
// todo implement pdf import // todo implement pdf import
}, },
iconSize: 22,
), ),
IconMaterialButton( IconMaterialButton(
icon: const Icon(Icons.search), icon: const Icon(Icons.search),
color: const Color.fromRGBO(255, 255, 255, .85), color: const Color.fromRGBO(255, 255, 255, .85),
onPressed: () {}, onPressed: () {},
iconSize: 22,
), ),
IconMaterialButton( IconMaterialButton(
icon: const Icon(Icons.more_vert), icon: const Icon(Icons.more_vert),
color: const Color.fromRGBO(255, 255, 255, .85), color: const Color.fromRGBO(255, 255, 255, .85),
onPressed: () {}, onPressed: () {},
iconSize: 22,
), ),
const SizedBox( const SizedBox(
width: 15, width: 15,

12
lib/widgets/collapse_drawer.dart
View File

@ -32,7 +32,8 @@ class _CollapseDrawerState extends State<CollapseDrawer>
controller = AnimationController( controller = AnimationController(
vsync: this, duration: const Duration(milliseconds: 200)); vsync: this, duration: const Duration(milliseconds: 200));
collapseAnimation = Tween<double>(begin: 62, end: 300).animate(controller) collapseAnimation = Tween<double>(begin: 62, end: 300)
.animate(CurvedAnimation(parent: controller, curve: Curves.easeInOut))
..addListener(() { ..addListener(() {
setState(() {}); setState(() {});
}); });
@ -41,13 +42,14 @@ class _CollapseDrawerState extends State<CollapseDrawer>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
padding: EdgeInsets.only(top: MediaQuery.of(context).viewPadding.top), padding:
color: const Color(0xff0d0d0d), EdgeInsets.only(top: MediaQuery.of(context).viewPadding.top + 15),
color: const Color(0xff000000),
child: ClipRRect( child: ClipRRect(
borderRadius: const BorderRadius.only( borderRadius: const BorderRadius.only(
topRight: Radius.circular(10), bottomRight: Radius.circular(10)), topRight: Radius.circular(10), bottomRight: Radius.circular(10)),
child: Container( child: Container(
color: const Color(0xff3f3f3f), color: const Color(0xff252525),
child: ConstrainedBox( child: ConstrainedBox(
constraints: BoxConstraints.expand(width: collapseAnimation.value), constraints: BoxConstraints.expand(width: collapseAnimation.value),
child: Column( child: Column(
@ -103,7 +105,7 @@ class _CollapseDrawerState extends State<CollapseDrawer>
], ],
), ),
const SizedBox( const SizedBox(
height: 40, height: 20,
), ),
Expanded( Expanded(
child: ListView( child: ListView(

15
lib/widgets/drawer_item.dart
View File

@ -20,28 +20,29 @@ class DrawerItem extends StatelessWidget {
return InkWell( return InkWell(
onTap: onTap, onTap: onTap,
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 9, top: 7, bottom: 7, right: 9), padding: const EdgeInsets.only(left: 9, top: 2, bottom: 2, right: 9),
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
child: Container( child: Container(
color: active ? const Color(0xff6e6e6e) : Colors.transparent, color: active ? const Color(0xff4d4d4d) : Colors.transparent,
child: Padding( child: Padding(
padding: padding:
const EdgeInsets.only(left: 9, top: 7, bottom: 7, right: 9), const EdgeInsets.only(left: 9, top: 13, bottom: 13, right: 9),
child: Row( child: Row(
children: [ children: [
Icon( Icon(
dta.icon, dta.icon,
size: 26, size: 23,
color: const Color(0xffdbdbdb), color: const Color(0xffe5e5e5),
), ),
if (!collapsed) ...[ if (!collapsed) ...[
const SizedBox( const SizedBox(
width: 10, width: 17,
), ),
Text( Text(
dta.name, dta.name,
style: const TextStyle(color: Color(0xffe9e9e9)), style: const TextStyle(
color: Color(0xffe5e5e5), fontSize: 16),
), ),
Expanded(child: Container()), Expanded(child: Container()),
Text( Text(

113
lib/widgets/tool_bar.dart
View File

@ -23,63 +23,68 @@ class _ToolBarState extends State<ToolBar> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
color: const Color(0xff3f3f3f), color: const Color(0xff252525),
width: 45, width: 40,
child: Column( child: Padding(
children: [ padding: const EdgeInsets.only(left: 3, right: 3),
const SizedBox( child: Column(
height: 10, children: [
), const SizedBox(
IconMaterialButton( height: 10,
icon: const Iconify(
EmojioneMonotone.fountain_pen,
color: Color.fromRGBO(255, 255, 255, .85),
), ),
color: const Color.fromRGBO(255, 255, 255, .85), IconMaterialButton(
onPressed: () { icon: const Iconify(
setState(() => activepen = Pen.pen); EmojioneMonotone.fountain_pen,
widget.onPenChange(Pen.pen); size: 20,
}, color: Color.fromRGBO(255, 255, 255, .85),
selected: activepen == Pen.pen, ),
iconSize: 24, color: const Color.fromRGBO(255, 255, 255, .85),
), onPressed: () {
IconMaterialButton( setState(() => activepen = Pen.pen);
icon: const Iconify( widget.onPenChange(Pen.pen);
Jam.highlighter, },
color: Color.fromRGBO(255, 255, 255, .85), selected: activepen == Pen.pen,
iconSize: 20,
), ),
color: const Color.fromRGBO(255, 255, 255, .85), IconMaterialButton(
onPressed: () { icon: const Iconify(
setState(() => activepen = Pen.highlighter); Jam.highlighter,
widget.onPenChange(Pen.highlighter); size: 20,
}, color: Color.fromRGBO(255, 255, 255, .85),
selected: activepen == Pen.highlighter, ),
iconSize: 24, color: const Color.fromRGBO(255, 255, 255, .85),
), onPressed: () {
IconMaterialButton( setState(() => activepen = Pen.highlighter);
icon: Transform.translate( widget.onPenChange(Pen.highlighter);
offset: const Offset(-2.0, .0), },
child: const AdwaitaIcon(AdwaitaIcons.eraser2), selected: activepen == Pen.highlighter,
iconSize: 20,
), ),
color: const Color.fromRGBO(255, 255, 255, .85), IconMaterialButton(
onPressed: () { icon: Transform.translate(
setState(() => activepen = Pen.eraser); offset: const Offset(-2.0, .0),
widget.onPenChange(Pen.eraser); child: const AdwaitaIcon(AdwaitaIcons.eraser2),
}, ),
iconSize: 24, color: const Color.fromRGBO(255, 255, 255, .85),
selected: activepen == Pen.eraser, onPressed: () {
), setState(() => activepen = Pen.eraser);
IconMaterialButton( widget.onPenChange(Pen.eraser);
icon: const Icon(FluentIcons.select_object_24_regular), },
color: const Color.fromRGBO(255, 255, 255, .85), iconSize: 20,
onPressed: () { selected: activepen == Pen.eraser,
setState(() => activepen = Pen.selector); ),
widget.onPenChange(Pen.selector); IconMaterialButton(
}, icon: const Icon(FluentIcons.select_object_24_regular),
selected: activepen == Pen.selector, color: const Color.fromRGBO(255, 255, 255, .85),
iconSize: 24, onPressed: () {
), setState(() => activepen = Pen.selector);
], widget.onPenChange(Pen.selector);
},
selected: activepen == Pen.selector,
iconSize: 20,
),
],
),
), ),
); );
} }