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
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/widgets/collapse_drawer.dart
View File

@ -32,7 +32,8 @@ class _CollapseDrawerState extends State<CollapseDrawer>
controller = AnimationController(
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(() {
setState(() {});
});
@ -41,13 +42,14 @@ class _CollapseDrawerState extends State<CollapseDrawer>
@override
Widget build(BuildContext context) {
return Container(
padding: EdgeInsets.only(top: MediaQuery.of(context).viewPadding.top),
color: const Color(0xff0d0d0d),
padding:
EdgeInsets.only(top: MediaQuery.of(context).viewPadding.top + 15),
color: const Color(0xff000000),
child: ClipRRect(
borderRadius: const BorderRadius.only(
topRight: Radius.circular(10), bottomRight: Radius.circular(10)),
child: Container(
color: const Color(0xff3f3f3f),
color: const Color(0xff252525),
child: ConstrainedBox(
constraints: BoxConstraints.expand(width: collapseAnimation.value),
child: Column(
@ -103,7 +105,7 @@ class _CollapseDrawerState extends State<CollapseDrawer>
],
),
const SizedBox(
height: 40,
height: 20,
),
Expanded(
child: ListView(

15
lib/widgets/drawer_item.dart
View File

@ -20,28 +20,29 @@ class DrawerItem extends StatelessWidget {
return InkWell(
onTap: onTap,
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(
borderRadius: BorderRadius.circular(10),
child: Container(
color: active ? const Color(0xff6e6e6e) : Colors.transparent,
color: active ? const Color(0xff4d4d4d) : Colors.transparent,
child: 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(
children: [
Icon(
dta.icon,
size: 26,
color: const Color(0xffdbdbdb),
size: 23,
color: const Color(0xffe5e5e5),
),
if (!collapsed) ...[
const SizedBox(
width: 10,
width: 17,
),
Text(
dta.name,
style: const TextStyle(color: Color(0xffe9e9e9)),
style: const TextStyle(
color: Color(0xffe5e5e5), fontSize: 16),
),
Expanded(child: Container()),
Text(

113
lib/widgets/tool_bar.dart
View File

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