Skip to content

Commit 0a6f9d0

Browse files
authored
chore(cat-voices): Update icons in sidebar of proposal builder (#2274)
* chore: change icons in side panels for collapsing them * chore: submission date update
1 parent 46b6151 commit 0a6f9d0

File tree

8 files changed

+21
-26
lines changed

8 files changed

+21
-26
lines changed

catalyst_voices/apps/voices/lib/pages/proposal_builder/proposal_builder_navigation_panel.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class ProposalBuilderNavigationPanel extends StatelessWidget {
1212
Widget build(BuildContext context) {
1313
return SpaceSidePanel(
1414
isLeft: true,
15-
name: context.l10n.workspaceProposalNavigation,
1615
onCollapseTap: () {},
1716
tabs: [
1817
SpaceSidePanelTab(

catalyst_voices/apps/voices/lib/pages/proposal_builder/proposal_builder_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class _ProposalBuilderPageState extends State<ProposalBuilderPage>
181181
void _dontShowCampaignSubmissionClosingDialog(bool value) {
182182
context
183183
.read<SessionCubit>()
184-
.updateShowSubmissionClosingWarning(value: value);
184+
.updateShowSubmissionClosingWarning(value: !value);
185185
}
186186

187187
void _handleSegmentsControllerChange() {

catalyst_voices/apps/voices/lib/pages/proposal_builder/proposal_builder_setup_panel.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ class ProposalBuilderSetupPanel extends StatelessWidget {
1010
Widget build(BuildContext context) {
1111
return SpaceSidePanel(
1212
isLeft: false,
13-
name: context.l10n.workspaceProposalSetup,
1413
onCollapseTap: () {},
1514
tabs: [
1615
SpaceSidePanelTab(

catalyst_voices/apps/voices/lib/pages/treasury/treasury_details_panel.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ class TreasuryDetailsPanel extends StatelessWidget {
88
Widget build(BuildContext context) {
99
return SpaceSidePanel(
1010
isLeft: false,
11-
name: 'Campaign comments',
1211
onCollapseTap: () {},
1312
tabs: [
1413
SpaceSidePanelTab(

catalyst_voices/apps/voices/lib/pages/treasury/treasury_navigation_panel.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ class TreasuryNavigationPanel extends StatelessWidget {
1111
Widget build(BuildContext context) {
1212
return SpaceSidePanel(
1313
isLeft: true,
14-
name: context.l10n.treasuryCampaignBuilder,
1514
onCollapseTap: () {},
1615
tabs: [
1716
SpaceSidePanelTab(

catalyst_voices/apps/voices/lib/pages/workspace/page/workspace_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class _WorkspacePageState extends State<WorkspacePage>
8888
void _dontShowCampaignSubmissionClosingDialog(bool value) {
8989
context
9090
.read<SessionCubit>()
91-
.updateShowSubmissionClosingWarning(value: value);
91+
.updateShowSubmissionClosingWarning(value: !value);
9292
}
9393

9494
void _showDeleteErrorSnackBar() {

catalyst_voices/apps/voices/lib/widgets/containers/sidebar/space_side_panel.dart

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
import 'package:catalyst_voices/widgets/buttons/voices_buttons.dart';
1+
import 'package:catalyst_voices/widgets/buttons/voices_icon_button.dart';
22
import 'package:catalyst_voices/widgets/common/tab_bar_stack_view.dart';
3-
import 'package:catalyst_voices/widgets/headers/section_header.dart';
43
import 'package:catalyst_voices/widgets/widgets.dart' show SidebarScaffold;
4+
import 'package:catalyst_voices_assets/catalyst_voices_assets.dart';
55
import 'package:catalyst_voices_brands/catalyst_voices_brands.dart';
66
import 'package:flutter/material.dart';
77

88
/// Defines usual space panel. This widget is opinionated and should
99
/// be used together with [SidebarScaffold].
1010
///
11-
/// Always have [name], [tabs] and tabs content [SpaceSidePanelTab.body].
11+
/// Always have [tabs] and tabs content [SpaceSidePanelTab.body].
1212
class SpaceSidePanel extends StatefulWidget {
1313
final bool isLeft;
14-
final String name;
1514
final VoidCallback? onCollapseTap;
1615
final TabController? tabController;
1716
final List<SpaceSidePanelTab> tabs;
@@ -20,7 +19,6 @@ class SpaceSidePanel extends StatefulWidget {
2019
const SpaceSidePanel({
2120
super.key,
2221
required this.isLeft,
23-
required this.name,
2422
this.onCollapseTap,
2523
this.tabController,
2624
required this.tabs,
@@ -75,24 +73,24 @@ class _Container extends StatelessWidget {
7573
}
7674

7775
class _Header extends StatelessWidget {
78-
final String name;
7976
final VoidCallback? onCollapseTap;
8077
final bool isLeft;
8178

8279
const _Header({
83-
required this.name,
8480
this.onCollapseTap,
8581
required this.isLeft,
8682
});
8783

8884
@override
8985
Widget build(BuildContext context) {
90-
return SectionHeader(
91-
leading: isLeft ? LeftArrowButton(onTap: onCollapseTap) : null,
92-
title: Text(name),
93-
trailing: [
94-
if (!isLeft) RightArrowButton(onTap: onCollapseTap),
95-
],
86+
return Align(
87+
alignment: isLeft ? Alignment.centerLeft : Alignment.centerRight,
88+
child: VoicesIconButton(
89+
onTap: onCollapseTap,
90+
child: isLeft
91+
? VoicesAssets.icons.leftRailToggle.buildIcon()
92+
: VoicesAssets.icons.rightRailToggle.buildIcon(),
93+
),
9694
);
9795
}
9896
}
@@ -109,19 +107,21 @@ class _SpaceSidePanelState extends State<SpaceSidePanel>
109107
children: [
110108
if (widget.isLeft)
111109
Positioned(
112-
top: 28,
113-
left: 24,
114-
child: RightArrowButton(
110+
top: 24,
111+
left: 16,
112+
child: VoicesIconButton(
113+
child: VoicesAssets.icons.leftRailToggle.buildIcon(),
115114
onTap: () {
116115
_controller.reverse();
117116
},
118117
),
119118
)
120119
else
121120
Positioned(
122-
top: 28,
121+
top: 24,
123122
right: 16,
124-
child: LeftArrowButton(
123+
child: VoicesIconButton(
124+
child: VoicesAssets.icons.rightRailToggle.buildIcon(),
125125
onTap: () {
126126
_controller.reverse();
127127
},
@@ -140,7 +140,6 @@ class _SpaceSidePanelState extends State<SpaceSidePanel>
140140
mainAxisSize: MainAxisSize.max,
141141
children: [
142142
_Header(
143-
name: widget.name,
144143
onCollapseTap: () {
145144
_controller.forward();
146145
widget.onCollapseTap?.call();

catalyst_voices/packages/internal/catalyst_voices_models/lib/src/campaign/campaign_timeline.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ extension CampaignTimelineX on CampaignTimeline {
5050
'''Participants submit initial proposals for ideas to solve challenges. A set amount of ada is allocated to the new funding round.''',
5151
timeline: DateRange(
5252
from: DateTime(2025, 3, 28, 16, 50),
53-
to: DateTime(2025, 4, 15),
53+
to: DateTime(2025, 4, 31),
5454
),
5555
stage: CampaignTimelineStage.proposalSubmission,
5656
),

0 commit comments

Comments
 (0)