refactor: merge redirection and UI

hypha-dao · Sep 3, 2024 · 988d857 · 988d857
1 parent bbc6001
commit 988d857
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 56 deletions.
diff --git a/.../proposals/components/proposal_admin.dart → ...roposals/components/proposal_creator.dart b/.../proposals/components/proposal_admin.dart → ...roposals/components/proposal_creator.dart
@@ -3,23 +3,23 @@ import 'package:hypha_wallet/design/avatar_image/hypha_avatar_image.dart';
 import 'package:hypha_wallet/design/hypha_colors.dart';
 import 'package:hypha_wallet/design/themes/extensions/theme_extension_provider.dart';
 
-class ProposalAdmin extends StatelessWidget {
-  final String adminName;
-  final String adminImageUrl;
-  const ProposalAdmin(this.adminName, this.adminImageUrl, {super.key});
+class ProposalCreator extends StatelessWidget {
+  final String creatorName;
+  final String creatorImageUrl;
+  const ProposalCreator(this.creatorName, this.creatorImageUrl, {super.key});
 
   @override
   Widget build(BuildContext context) {
     return Row(
       children: [
         HyphaAvatarImage(
           imageRadius: 24,
-          imageFromUrl: adminImageUrl,
+          imageFromUrl: creatorImageUrl,
         ),
         const SizedBox(width: 10),
         Expanded(
           child: Text(
-            adminName,
+            creatorName,
             style: context.hyphaTextTheme.ralMediumSmallNote.copyWith(color: HyphaColors.midGrey),
           ),
         ),

diff --git a/lib/ui/proposals/details/components/proposal_details_view.dart b/lib/ui/proposals/details/components/proposal_details_view.dart
@@ -10,7 +10,7 @@ import 'package:hypha_wallet/design/buttons/hypha_app_button.dart';
 import 'package:hypha_wallet/design/dividers/hypha_divider.dart';
 import 'package:hypha_wallet/design/hypha_colors.dart';
 import 'package:hypha_wallet/design/themes/extensions/theme_extension_provider.dart';
-import 'package:hypha_wallet/ui/proposals/components/proposal_admin.dart';
+import 'package:hypha_wallet/ui/proposals/components/proposal_creator.dart';
 import 'package:hypha_wallet/ui/proposals/components/proposal_button.dart';
 import 'package:hypha_wallet/ui/proposals/components/proposal_expiration_timer.dart';
 import 'package:hypha_wallet/ui/proposals/components/proposal_header.dart';
@@ -112,7 +112,7 @@ class _ProposalDetailsViewState extends State<ProposalDetailsView> {
                   style: context.hyphaTextTheme.mediumTitles,
                 ),
               ),
-              ProposalAdmin(
+              ProposalCreator(
                 widget.proposalModel.creator,
                 'https://etudestech.com/wp-content/uploads/2023/05/midjourney-scaled.jpeg',
               ),

diff --git a/lib/ui/proposals/list/components/hypha_proposals_action_card.dart b/lib/ui/proposals/list/components/hypha_proposals_action_card.dart
@@ -9,13 +9,12 @@ import 'package:hypha_wallet/design/hypha_card.dart';
 import 'package:hypha_wallet/design/hypha_colors.dart';
 import 'package:hypha_wallet/design/themes/extensions/theme_extension_provider.dart';
 import 'package:hypha_wallet/ui/blocs/authentication/authentication_bloc.dart';
-import 'package:hypha_wallet/ui/proposals/components/proposal_admin.dart';
 import 'package:hypha_wallet/ui/proposals/components/proposal_button.dart';
+import 'package:hypha_wallet/ui/proposals/components/proposal_creator.dart';
 import 'package:hypha_wallet/ui/proposals/components/proposal_expiration_timer.dart';
 import 'package:hypha_wallet/ui/proposals/components/proposal_header.dart';
 import 'package:hypha_wallet/ui/proposals/components/proposal_percentage_indicator.dart';
 import 'package:hypha_wallet/ui/proposals/details/proposal_details_page.dart';
-import 'package:percent_indicator/linear_percent_indicator.dart';
 
 class HyphaProposalsActionCard extends StatelessWidget {
   final ProposalModel proposalModel;
@@ -28,53 +27,51 @@ class HyphaProposalsActionCard extends StatelessWidget {
       children: [
         _buildVoteStatusOverlay(context),
         HyphaCard(
-          child: InkWell(
-            borderRadius: BorderRadius.circular(16),
-            onTap: () {
-            },
-            child: Padding(
-              padding: const EdgeInsets.all(22),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  ProposalHeader(
-                    proposalModel.daoName,
-                    'https://etudestech.com/wp-content/uploads/2023/05/midjourney-scaled.jpeg',
-                  ),
-                  const SizedBox(height: 18),
-                  const HyphaDivider(),
-                  const SizedBox(height: 18),
-                  _buildProposalRoleAssignment(
-                    context,
-                    proposalModel.commitment ?? 0,
-                    proposalModel.title ?? 'No title set for this proposal.',
-                  ),
-                  const SizedBox(height: 20),
-                  ProposalPercentageIndicator(
+          child: Padding(
+            padding: const EdgeInsets.all(22),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                ProposalHeader(
+                  proposalModel.daoName,
+                  'https://etudestech.com/wp-content/uploads/2023/05/midjourney-scaled.jpeg',
+                ),
+                const Padding(
+                  padding: EdgeInsets.symmetric(vertical: 18),
+                  child: HyphaDivider(),
+                ),
+                _buildProposalRoleAssignment(
+                  context,
+                  proposalModel.commitment ?? 0,
+                  proposalModel.title ?? 'No title set for this proposal.',
+                ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 20),
+                  child: ProposalPercentageIndicator(
                     'Unity',
                     proposalModel.unityToPercent(),
                     HyphaColors.success
                   ),
-                  const SizedBox(height: 20),
-                  ProposalPercentageIndicator(
-                    'Quorum',
-                    proposalModel.quorumToPercent(),
-                      HyphaColors.success
-                  ),
-                  const SizedBox(height: 20),
-                  ProposalExpirationTimer(
-                    proposalModel.formatExpiration(),
-                  ),
-                  const SizedBox(height: 16),
-                  const HyphaDivider(),
-                  const SizedBox(height: 16),
-                  _buildProposalCardFooter(
-                    context,
-                    proposalModel.creator,
-                    'https://etudestech.com/wp-content/uploads/2023/05/midjourney-scaled.jpeg',
-                  ),
-                ],
-              ),
+                ),
+                ProposalPercentageIndicator(
+                  'Quorum',
+                  proposalModel.quorumToPercent(),
+                    HyphaColors.success
+                ),
+                const SizedBox(height: 20),
+                ProposalExpirationTimer(
+                  proposalModel.formatExpiration(),
+                ),
+                const Padding(
+                  padding: EdgeInsets.symmetric(vertical: 16),
+                  child: HyphaDivider(),
+                ),
+                _buildProposalCardFooter(
+                  context,
+                  proposalModel.creator,
+                  'https://etudestech.com/wp-content/uploads/2023/05/midjourney-scaled.jpeg',
+                ),
+              ],
             ),
           ),
         ),
@@ -154,14 +151,19 @@ class HyphaProposalsActionCard extends StatelessWidget {
     );
   }
 
-  Widget _buildProposalCardFooter(BuildContext context, String adminName, String adminImageUrl) {
+  Widget _buildProposalCardFooter(BuildContext context, String creatorName, String creatorImageUrl) {
     return Row(
       children: [
-        Expanded(child: ProposalAdmin(adminName, adminImageUrl)),
+        Expanded(child: ProposalCreator(creatorName, creatorImageUrl)),
         ProposalButton(
             'Details',
             Icons.arrow_forward_ios,
-                () {}
+                () {
+                  Get.Get.to(
+                    ProposalDetailsPage(proposalModel),
+                    transition: Get.Transition.rightToLeft,
+                  );
+                }
         ),
       ],
     );