Skip to content

Commit 5da3f3a

Browse files
cleanup code
1 parent 8f8d07d commit 5da3f3a

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

lib/features/sorting/base/view/sorting_page.dart

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,21 +140,14 @@ class _BuildItem extends ConsumerWidget {
140140
final itemWidth = SortingNotifier.calculateItemWidth(context, size);
141141
final currentItem = ref.watch(instance.select((state) => state.list[index]));
142142

143-
final color = currentItem.sortedStatus == SortingStatus.sorted
144-
? SortingNotifier.doneSortingColor
145-
: (currentItem.sortedStatus == SortingStatus.swapped
146-
? SortingNotifier.swipedColor
147-
: currentItem.sortedStatus == SortingStatus.compared
148-
? SortingNotifier.comparedColor
149-
: SortingNotifier.itemColor);
150143
return Padding(
151144
padding: EdgeInsets.symmetric(horizontal: SortingNotifier.itemsPadding / 2),
152145
child: AnimatedContainer(
153146
duration: speedDuration,
154147
height: SortingNotifier.calculateItemHeight(item.value, size),
155148
width: itemWidth,
156149
decoration: BoxDecoration(
157-
color: context.getColor(color),
150+
color: context.getColor(currentItem.getColor),
158151
borderRadius: const BorderRadius.vertical(top: Radius.circular(1)),
159152
),
160153
),

lib/features/sorting/base/view_model/sorting_notifier.dart

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ abstract class SortingNotifier extends StateNotifier<SortingNotifierState> {
1717

1818
static double maxListItemHeight = 250.h;
1919
static double itemsPadding = 1.w;
20-
static const ThemeEnum swipedColor = ThemeEnum.redColor;
20+
static const ThemeEnum swipingColor = ThemeEnum.redColor;
2121
static const ThemeEnum comparedColor = ThemeEnum.comparedColor;
2222
static const ThemeEnum itemColor = ThemeEnum.blueColor;
2323
static const ThemeEnum doneSortingColor = ThemeEnum.greenColor;
@@ -145,9 +145,9 @@ abstract class SortingNotifier extends StateNotifier<SortingNotifierState> {
145145

146146
break;
147147

148-
case SortingStatus.swapped:
149-
list[step.index1] = list[step.index1].copyWith(sortedStatus: SortingStatus.swapped);
150-
list[step.index2] = list[step.index2].copyWith(sortedStatus: SortingStatus.swapped);
148+
case SortingStatus.swiping:
149+
list[step.index1] = list[step.index1].copyWith(sortedStatus: SortingStatus.swiping);
150+
list[step.index2] = list[step.index2].copyWith(sortedStatus: SortingStatus.swiping);
151151
state = state.copyWith(list: list);
152152

153153
await Future.delayed(speedDuration);
@@ -162,13 +162,14 @@ abstract class SortingNotifier extends StateNotifier<SortingNotifierState> {
162162
state = state.copyWith(list: list, positions: positions);
163163
break;
164164

165+
case SortingStatus.swiped:
165166
case SortingStatus.unSorted:
166167
list[step.index1] = list[step.index1].copyWith(sortedStatus: SortingStatus.unSorted);
167168
list[step.index2] = list[step.index2].copyWith(sortedStatus: SortingStatus.unSorted);
168169
state = state.copyWith(list: list);
169170
break;
170171

171-
// i don't want to make it green while sorting and mark all of them at once as green at the end
172+
// i don't want to make it green while sorting and mark all of them at once as green at the end
172173
case SortingStatus.sorted:
173174
case SortingStatus.none:
174175
list[step.index1] = list[step.index1].copyWith(sortedStatus: SortingStatus.none);
@@ -181,5 +182,6 @@ abstract class SortingNotifier extends StateNotifier<SortingNotifierState> {
181182

182183
await greenSortedItemsAsDone();
183184
}
185+
184186
List<SortingStep> buildSorting(List<int> values);
185187
}

0 commit comments

Comments
 (0)