Skip to content

Commit 70770fd

Browse files
TeeWrathTeeWrath
committed
fix: numbering and sticky notes error
1 parent cb931c4 commit 70770fd

File tree

2 files changed

+73
-32
lines changed

2 files changed

+73
-32
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ class StickyNotesWidget extends StatelessWidget {
6767
shrinkWrap: true,
6868
physics: const NeverScrollableScrollPhysics(),
6969
children: List.generate(
70-
tertiaryColors.length,
70+
tertiaryColors.length < secondaryColors.length
71+
? tertiaryColors.length
72+
: secondaryColors.length,
7173
(index) => _buildStickyNote(
7274
context, // Pass context
7375
tertiaryColors[index],

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

Lines changed: 70 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@ class WorkspaceDrawer extends StatelessWidget {
1616
Widget build(BuildContext context) {
1717
final device = rh.ResponsiveLayoutHelper.getDeviceType(context);
1818

19-
return Consumer2<WorkspaceProvider,SupabaseService>(
20-
builder: (context, provider,suprovider, child) {
21-
Color defaultBorderColor = suprovider.isDark ? Color.fromRGBO(75, 75, 75, 1) : const Color(0xFFD9D9D9);
19+
return Consumer2<WorkspaceProvider, SupabaseService>(
20+
builder: (context, provider, suprovider, child) {
21+
Color defaultBorderColor =
22+
suprovider.isDark
23+
? Color.fromRGBO(75, 75, 75, 1)
24+
: const Color(0xFFD9D9D9);
2225

2326
// Check if currentWorkspace is set before accessing its properties
2427
final String workspaceName =
@@ -33,14 +36,22 @@ class WorkspaceDrawer extends StatelessWidget {
3336
},
3437
child: AnimatedContainer(
3538
duration: const Duration(milliseconds: 300),
36-
height: provider.isDrawerOpen ? 1.sh :device == rh.DeviceType.desktop ?0.09.sh : 0.08.sh,
39+
height:
40+
provider.isDrawerOpen
41+
? 1.sh
42+
: device == rh.DeviceType.desktop
43+
? 0.09.sh
44+
: 0.08.sh,
3745
width: device == rh.DeviceType.desktop ? 0.195.sw : 0.27.sw,
3846
padding: EdgeInsets.symmetric(
3947
horizontal: device == rh.DeviceType.desktop ? 24.w : 15.w,
40-
vertical:device == rh.DeviceType.desktop ? 16.h :10.h,
48+
vertical: device == rh.DeviceType.desktop ? 16.h : 10.h,
4149
),
4250
decoration: BoxDecoration(
43-
color: suprovider.isDark ? Color.fromRGBO(48, 48, 48, 1): Colors.white,
51+
color:
52+
suprovider.isDark
53+
? Color.fromRGBO(48, 48, 48, 1)
54+
: Colors.white,
4455
borderRadius: BorderRadius.circular(12.r),
4556
border: Border.all(color: defaultBorderColor, width: 1.2),
4657
),
@@ -55,9 +66,7 @@ class WorkspaceDrawer extends StatelessWidget {
5566
onPressed: () {
5667
// Ensure exitWorkspace is called when navigating back
5768

58-
context.goNamed(
59-
RouteName.dashboard
60-
);
69+
context.goNamed(RouteName.dashboard);
6170
provider.exitWorkspace();
6271
},
6372
icon: Icon(
@@ -77,7 +86,8 @@ class WorkspaceDrawer extends StatelessWidget {
7786
fontSize:
7887
device == rh.DeviceType.desktop ? 24.sp : 42.sp,
7988
fontWeight: FontWeight.w600,
80-
color:suprovider.isDark ? Colors.white : Colors.black,
89+
color:
90+
suprovider.isDark ? Colors.white : Colors.black,
8191
letterSpacing: 0.6,
8292
),
8393
decoration: const InputDecoration(
@@ -89,20 +99,37 @@ class WorkspaceDrawer extends StatelessWidget {
8999
),
90100
),
91101
),
92-
SizedBox(width:device == rh.DeviceType.desktop ? 50.w : 20.w),
102+
SizedBox(
103+
width: device == rh.DeviceType.desktop ? 50.w : 20.w,
104+
),
93105
IconButton(
94106
onPressed: () {
95107
provider.toggleDrawer();
96108
},
97-
icon:!provider.isDrawerOpen? Icon(
98-
PhosphorIconsRegular.sidebarSimple,
99-
size: device == rh.DeviceType.desktop ? 32.sp : 50.sp,
100-
color: suprovider.isDark ? Colors.white : Colors.black,
101-
) : Icon(
102-
Icons.close,
103-
size: device == rh.DeviceType.desktop ? 32.sp : 50.sp,
104-
color: suprovider.isDark ? Colors.white: Colors.black,
105-
),
109+
icon:
110+
!provider.isDrawerOpen
111+
? Icon(
112+
PhosphorIconsRegular.sidebarSimple,
113+
size:
114+
device == rh.DeviceType.desktop
115+
? 32.sp
116+
: 50.sp,
117+
color:
118+
suprovider.isDark
119+
? Colors.white
120+
: Colors.black,
121+
)
122+
: Icon(
123+
Icons.close,
124+
size:
125+
device == rh.DeviceType.desktop
126+
? 32.sp
127+
: 50.sp,
128+
color:
129+
suprovider.isDark
130+
? Colors.white
131+
: Colors.black,
132+
),
106133
splashRadius: 24.r,
107134
tooltip: 'Toggle Sidebar',
108135
),
@@ -122,7 +149,9 @@ class WorkspaceDrawer extends StatelessWidget {
122149
? Column(
123150
mainAxisSize: MainAxisSize.max,
124151
children: [
125-
device == rh.DeviceType.desktop ? SizedBox(height: 20.h) : SizedBox(height: 10.h,),
152+
device == rh.DeviceType.desktop
153+
? SizedBox(height: 20.h)
154+
: SizedBox(height: 10.h),
126155
const Divider(
127156
color: Colors.grey,
128157
thickness: 0.5,
@@ -135,16 +164,17 @@ class WorkspaceDrawer extends StatelessWidget {
135164
provider.canvasObjectsList.length,
136165
separatorBuilder:
137166
(context, index) =>
138-
device == rh.DeviceType.desktop ? SizedBox(height: 8.h):SizedBox(height: 2.h),
167+
device == rh.DeviceType.desktop
168+
? SizedBox(height: 8.h)
169+
: SizedBox(height: 2.h),
139170
itemBuilder: (context, index) {
140171
CanvasObject item =
141172
provider.canvasObjectsList[index];
142173
return _buildSelectableListTile(
143174
context,
144175
provider: provider,
145176
title:
146-
item.toJson()['object_type']
147-
as String,
177+
'${index + 1} ${item.toJson()['object_type'] as String}',
148178
iconData: provider
149179
.getIconForObjectType(
150180
item.toJson()['object_type'],
@@ -154,13 +184,13 @@ class WorkspaceDrawer extends StatelessWidget {
154184
provider
155185
.currentlySelectedObjectId ==
156186
item.id,
157-
device: device,
187+
device: device,
158188
onTap: () {
159189
provider.changeCurrentlySelectedObj(
160190
item.id,
161191
);
162192
},
163-
su: suprovider
193+
su: suprovider,
164194
);
165195
},
166196
),
@@ -188,19 +218,28 @@ class WorkspaceDrawer extends StatelessWidget {
188218
required bool isSelected,
189219
required VoidCallback onTap,
190220
required rh.DeviceType device,
191-
required SupabaseService su
221+
required SupabaseService su,
192222
}) {
193-
Color iconTextColor = isSelected ? Colors.blue : su.isDark ? Colors.white : Colors.black;
223+
Color iconTextColor =
224+
isSelected
225+
? Colors.blue
226+
: su.isDark
227+
? Colors.white
228+
: Colors.black;
194229

195230
return Container(
196-
color: su.isDark ? Color.fromRGBO(48, 48, 48, 1): Colors.white,
231+
color: su.isDark ? Color.fromRGBO(48, 48, 48, 1) : Colors.white,
197232
child: ListTile(
198-
leading: Icon(iconData, size:device == rh.DeviceType.desktop ? 24.sp : 35.sp, color: iconTextColor),
233+
leading: Icon(
234+
iconData,
235+
size: device == rh.DeviceType.desktop ? 24.sp : 35.sp,
236+
color: iconTextColor,
237+
),
199238
title: Text(
200239
title,
201240
style: TextStyle(
202241
fontFamily: 'Fredrik',
203-
fontSize:device == rh.DeviceType.desktop ? 18.sp : 28.sp,
242+
fontSize: device == rh.DeviceType.desktop ? 18.sp : 28.sp,
204243
color: iconTextColor,
205244
),
206245
),

0 commit comments

Comments
 (0)