Skip to content

Commit 7b8934d

Browse files
TeeWrathTeeWrath
authored
Merge pull request #37 from swarno-tech/rewrite
tooltip updated in workspace
2 parents 4337dfe + 0734a2d commit 7b8934d

File tree

2 files changed

+44
-22
lines changed

2 files changed

+44
-22
lines changed

‎lib/features/workspace/widgets/toolbar.dart‎

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class ToolBar extends StatelessWidget {
4747
),
4848
child:
4949
device == rh.DeviceType.mobile
50-
? FittedBox(
50+
? FittedBox(
5151
fit: BoxFit.scaleDown,
5252
child: Row(
5353
mainAxisSize: MainAxisSize.min,
@@ -61,7 +61,7 @@ class ToolBar extends StatelessWidget {
6161
context,
6262
provider,
6363
device,
64-
suprovider
64+
suprovider,
6565
); // Pass the provider
6666
},
6767
backgroundColor:
@@ -77,7 +77,7 @@ class ToolBar extends StatelessWidget {
7777
'Add new node',
7878
device,
7979
onPressed: () {
80-
_showNodePicker(context, device,suprovider);
80+
_showNodePicker(context, device, suprovider);
8181
},
8282
backgroundColor:
8383
suprovider.isDark
@@ -165,7 +165,9 @@ class ToolBar extends StatelessWidget {
165165
provider.currentMode == DrawMode.stickyNote
166166
? Colors.blue
167167
: tertiaryColors[6],
168-
onPressed: () => _showStickyNote(context, device,suprovider),
168+
onPressed:
169+
() =>
170+
_showStickyNote(context, device, suprovider),
169171
backgroundColor:
170172
suprovider.isDark
171173
? Color.fromRGBO(48, 48, 48, 1)
@@ -186,7 +188,7 @@ class ToolBar extends StatelessWidget {
186188
context,
187189
provider,
188190
device,
189-
suprovider
191+
suprovider,
190192
); // Pass the provider
191193
},
192194
backgroundColor:
@@ -202,7 +204,7 @@ class ToolBar extends StatelessWidget {
202204
'Add new node',
203205
device,
204206
onPressed: () {
205-
_showNodePicker(context, device,suprovider);
207+
_showNodePicker(context, device, suprovider);
206208
},
207209
backgroundColor:
208210
suprovider.isDark
@@ -214,7 +216,7 @@ class ToolBar extends StatelessWidget {
214216
_horizontalDivider(device),
215217
_toolIcon(
216218
PhosphorIconsRegular.cursor,
217-
'Pointer',
219+
'Pointer\nPress P',
218220
device,
219221
iconColor:
220222
provider.currentMode == DrawMode.pointer
@@ -233,7 +235,7 @@ class ToolBar extends StatelessWidget {
233235
_horizontalDivider(device),
234236
_toolIcon(
235237
PhosphorIconsRegular.handGrabbing,
236-
'Pan',
238+
'Pan\nPress A',
237239
device,
238240
iconColor:
239241
provider.currentMode == DrawMode.hand
@@ -252,7 +254,7 @@ class ToolBar extends StatelessWidget {
252254
_horizontalDivider(device),
253255
_toolIcon(
254256
PhosphorIconsRegular.textT,
255-
'Text box',
257+
'Text box\nPress T',
256258
device,
257259
iconColor:
258260
provider.currentMode == DrawMode.textBox
@@ -284,13 +286,14 @@ class ToolBar extends StatelessWidget {
284286
_horizontalDivider(device),
285287
_toolIcon(
286288
PhosphorIconsFill.noteBlank,
287-
'Add new sticky note',
289+
'Add new sticky note\nPress S',
288290
device,
289291
iconColor:
290292
provider.currentMode == DrawMode.stickyNote
291293
? Colors.blue
292294
: tertiaryColors[6],
293-
onPressed: () => _showStickyNote(context, device,suprovider),
295+
onPressed:
296+
() => _showStickyNote(context, device, suprovider),
294297
backgroundColor:
295298
suprovider.isDark
296299
? Color.fromRGBO(48, 48, 48, 1)
@@ -346,7 +349,11 @@ class ToolBar extends StatelessWidget {
346349
);
347350
}
348351

349-
void _showNodePicker(BuildContext context, rh.DeviceType device,SupabaseService su) {
352+
void _showNodePicker(
353+
BuildContext context,
354+
rh.DeviceType device,
355+
SupabaseService su,
356+
) {
350357
final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
351358
if (renderBox == null) return;
352359

@@ -385,7 +392,7 @@ class ToolBar extends StatelessWidget {
385392
left: leftPos,
386393
child: Material(
387394
color: Colors.transparent,
388-
child: NodePicker(su: su,),
395+
child: NodePicker(su: su),
389396
),
390397
),
391398
],
@@ -398,7 +405,7 @@ class ToolBar extends StatelessWidget {
398405
BuildContext context,
399406
WorkspaceProvider provider,
400407
rh.DeviceType device,
401-
SupabaseService su
408+
SupabaseService su,
402409
) {
403410
final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
404411
if (renderBox != null) {
@@ -448,7 +455,11 @@ class ToolBar extends StatelessWidget {
448455
}
449456
}
450457

451-
void _showStickyNote(BuildContext context, rh.DeviceType device,SupabaseService su) {
458+
void _showStickyNote(
459+
BuildContext context,
460+
rh.DeviceType device,
461+
SupabaseService su,
462+
) {
452463
final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
453464
if (renderBox != null) {
454465
final position = renderBox.localToGlobal(Offset.zero);
@@ -465,7 +476,7 @@ class ToolBar extends StatelessWidget {
465476
),
466477
),
467478
Positioned(
468-
right:device == rh.DeviceType.mobile ? position.dx : 150.w ,
479+
right: device == rh.DeviceType.mobile ? position.dx : 150.w,
469480
top:
470481
device == rh.DeviceType.desktop
471482
? 500.h
@@ -474,7 +485,7 @@ class ToolBar extends StatelessWidget {
474485
: position.dy - 390.h,
475486
child: Material(
476487
color: Colors.transparent,
477-
child: StickyNotesWidget(su: su,),
488+
child: StickyNotesWidget(su: su),
478489
),
479490
),
480491
],

‎lib/features/workspace/widgets/zoom_control_button.dart‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,22 @@ class ZoomControlButton extends StatelessWidget {
1313
@override
1414
Widget build(BuildContext context) {
1515
final device = rh.ResponsiveLayoutHelper.getDeviceType(context);
16-
return Consumer2<CanvasProvider,SupabaseService>(
17-
builder: (context, canvasProvider,suprovider, child) {
16+
return Consumer2<CanvasProvider, SupabaseService>(
17+
builder: (context, canvasProvider, suprovider, child) {
1818
return Container(
1919
padding: EdgeInsets.symmetric(horizontal: 20.w, vertical: 16.h),
2020
decoration: BoxDecoration(
21-
border: Border.all(color:suprovider.isDark ? Color.fromRGBO(75, 75, 75, 1) :const Color(0XFFD9D9D9), width: 1.2),
22-
color:suprovider.isDark ? Color.fromRGBO(48, 48, 48, 1) : Colors.white,
21+
border: Border.all(
22+
color:
23+
suprovider.isDark
24+
? Color.fromRGBO(75, 75, 75, 1)
25+
: const Color(0XFFD9D9D9),
26+
width: 1.2,
27+
),
28+
color:
29+
suprovider.isDark
30+
? Color.fromRGBO(48, 48, 48, 1)
31+
: Colors.white,
2332
borderRadius: BorderRadius.circular(12.r),
2433
),
2534
child: Row(
@@ -49,6 +58,7 @@ class ZoomControlButton extends StatelessWidget {
4958
VerticalCustomDivider(),
5059
SizedBox(width: 8.w),
5160
IconButton(
61+
tooltip: "Press Z",
5262
onPressed: () {
5363
canvasProvider.zoomIn(); // Call zoomIn method
5464
},
@@ -67,6 +77,7 @@ class ZoomControlButton extends StatelessWidget {
6777
VerticalCustomDivider(),
6878
SizedBox(width: 8.w),
6979
IconButton(
80+
tooltip: 'Press X',
7081
onPressed: () {
7182
canvasProvider.zoomOut(); // Call zoomOut method
7283
},
@@ -98,7 +109,7 @@ class ZoomControlButton extends StatelessWidget {
98109
: 60.sp,
99110
), // Icon for reset
100111
visualDensity: VisualDensity.compact,
101-
tooltip: 'Reset Zoom',
112+
tooltip: 'Reset Zoom\nPress R',
102113
),
103114
],
104115
),

0 commit comments

Comments
 (0)