Add label text

wealth-wave · Jan 3, 2024 · d170752 · d170752
1 parent c577380
commit d170752
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 26 deletions.
diff --git a/lib/presentation/create_investment_presenter.dart b/lib/presentation/create_investment_presenter.dart
@@ -101,15 +101,11 @@ class CreateInvestmentViewState {
   SingleEvent<void>? onInvestmentCreated;
   List<BasketDO> baskets = List.empty(growable: false);
 
-  bool isValid({int? investmentId}) {
-    if (investmentId != null) {
-      return name.isNotEmpty && basketId != null;
-    } else {
+  bool isValid() {
       return name.isNotEmpty &&
           value > 0 &&
           isValidDate(valueUpdatedAt) &&
           basketId != null;
-    }
   }
 
   DateTime _getValueUpdatedAt() {

diff --git a/lib/ui/pages/goals_page.dart b/lib/ui/pages/goals_page.dart
@@ -67,9 +67,11 @@ class _GoalsPage extends PageState<GoalsViewState, GoalsPage, GoalsPresenter> {
                       Text(goal.name,
                           style: Theme.of(context).textTheme.titleMedium),
                       const Text(' | '),
-                      Text(_getImportance(goal.importance)),
+                      Text('${_getImportance(goal.importance)} Importance',
+                          style: Theme.of(context).textTheme.labelSmall),
                       const Text(' | '),
-                      Text('(${_getYearsLeft(goal.getYearsLeft())})'),
+                      Text('(${_getYearsLeft(goal.getYearsLeft())})',
+                          style: Theme.of(context).textTheme.labelSmall),
                       PopupMenuButton<int>(
                         onSelected: (value) {
                           if (value == 1) {

diff --git a/lib/ui/pages/investments_page.dart b/lib/ui/pages/investments_page.dart
@@ -71,10 +71,10 @@ class _InvestmentsPage extends PageState<InvestmentsViewState, InvestmentsPage,
                     children: [
                       Text(investment.name,
                           style: Theme.of(context).textTheme.titleMedium),
-                      const Text(' | '),
                       Text('(${investment.basketName})'),
                       const Text(' | '),
-                      Text(_getRiskLevel(investment.riskLevel)),
+                      Text('${_getRiskLevel(investment.riskLevel)} Risk',
+                          style: Theme.of(context).textTheme.labelSmall),
                       PopupMenuButton<int>(
                         onSelected: (value) {
                           if (value == 1) {

diff --git a/lib/ui/widgets/create_goal_dialog.dart b/lib/ui/widgets/create_goal_dialog.dart
@@ -99,7 +99,7 @@ class _CreateGoalPage extends PageState<CreateGoalViewState, _CreateGoalDialog,
               decoration: const InputDecoration(
                   labelText: 'Name', border: OutlineInputBorder()),
             ),
-            const SizedBox(height: AppDimen.minPadding),
+            const SizedBox(height: AppDimen.defaultPadding),
             TextFormField(
               textInputAction: TextInputAction.next,
               controller: _amountController,
@@ -108,7 +108,7 @@ class _CreateGoalPage extends PageState<CreateGoalViewState, _CreateGoalDialog,
               decoration: const InputDecoration(
                   labelText: 'Amount', border: OutlineInputBorder()),
             ),
-            const SizedBox(height: AppDimen.minPadding),
+            const SizedBox(height: AppDimen.defaultPadding),
             TextFormField(
               textInputAction: TextInputAction.next,
               controller: _currentDateController,
@@ -118,7 +118,7 @@ class _CreateGoalPage extends PageState<CreateGoalViewState, _CreateGoalDialog,
               decoration: const InputDecoration(
                   labelText: 'Date (DD-MM-YYYY)', border: OutlineInputBorder()),
             ),
-            const SizedBox(height: AppDimen.minPadding),
+            const SizedBox(height: AppDimen.defaultPadding),
             TextFormField(
               textInputAction: TextInputAction.next,
               controller: _targetDateController,
@@ -129,7 +129,7 @@ class _CreateGoalPage extends PageState<CreateGoalViewState, _CreateGoalDialog,
                   labelText: 'Target Date (DD-MM-YYYY)',
                   border: OutlineInputBorder()),
             ),
-            const SizedBox(height: AppDimen.minPadding),
+            const SizedBox(height: AppDimen.defaultPadding),
             TextFormField(
               textInputAction: TextInputAction.next,
               keyboardType: TextInputType.number,
@@ -139,7 +139,7 @@ class _CreateGoalPage extends PageState<CreateGoalViewState, _CreateGoalDialog,
                   hintText: 'Inflation (0 - 100)',
                   border: OutlineInputBorder()),
             ),
-            const SizedBox(height: AppDimen.minPadding),
+            const SizedBox(height: AppDimen.defaultPadding),
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
@@ -154,11 +154,10 @@ class _CreateGoalPage extends PageState<CreateGoalViewState, _CreateGoalDialog,
                 ),
               ],
             ),
-            const SizedBox(height: AppDimen.minPadding),
+            const SizedBox(height: AppDimen.defaultPadding),
             DropdownButtonFormField<GoalImportance>(
               decoration: const InputDecoration(
-                border: OutlineInputBorder(),
-              ),
+                  border: OutlineInputBorder(), labelText: 'Importance'),
               hint: const Text('Importance'),
               value: snapshot.importance,
               onChanged: (value) {

diff --git a/lib/ui/widgets/create_investment_dialog.dart b/lib/ui/widgets/create_investment_dialog.dart
@@ -83,7 +83,7 @@ class _CreateInvestmentPage extends PageState<CreateInvestmentViewState,
             decoration: const InputDecoration(
                 labelText: 'Name', border: OutlineInputBorder()),
           ),
-          const SizedBox(height: AppDimen.minPadding),
+          const SizedBox(height: AppDimen.defaultPadding),
           TextFormField(
             textInputAction: TextInputAction.next,
             controller: _valueController,
@@ -92,7 +92,7 @@ class _CreateInvestmentPage extends PageState<CreateInvestmentViewState,
             decoration: const InputDecoration(
                 labelText: 'Value', border: OutlineInputBorder()),
           ),
-          const SizedBox(height: AppDimen.minPadding),
+          const SizedBox(height: AppDimen.defaultPadding),
           TextFormField(
             textInputAction: TextInputAction.next,
             controller: _valueUpdatedDateController,
@@ -102,9 +102,10 @@ class _CreateInvestmentPage extends PageState<CreateInvestmentViewState,
             decoration: const InputDecoration(
                 labelText: 'Date (DD-MM-YYYY)', border: OutlineInputBorder()),
           ),
-          const SizedBox(height: AppDimen.minPadding),
+          const SizedBox(height: AppDimen.defaultPadding),
           DropdownButtonFormField<int>(
-              decoration: const InputDecoration(border: OutlineInputBorder()),
+              decoration: const InputDecoration(
+                  border: OutlineInputBorder(), labelText: 'Basket'),
               hint: const Text('Basket'),
               value: snapshot.basketId,
               onChanged: (value) {
@@ -118,11 +119,10 @@ class _CreateInvestmentPage extends PageState<CreateInvestmentViewState,
                         child: Text(e.name),
                       ))
                   .toList()),
-          const SizedBox(height: AppDimen.minPadding),
+          const SizedBox(height: AppDimen.defaultPadding),
           DropdownButtonFormField<RiskLevel>(
             decoration: const InputDecoration(
-              border: OutlineInputBorder(),
-            ),
+                border: OutlineInputBorder(), labelText: 'Risk Level'),
             hint: const Text('Risk Level'),
             value: snapshot.riskLevel,
             onChanged: (value) {
@@ -153,8 +153,7 @@ class _CreateInvestmentPage extends PageState<CreateInvestmentViewState,
                 Navigator.pop(context);
               }),
           ElevatedButton(
-            onPressed: snapshot.isValid(
-                    investmentId: widget.investmentToUpdate?.id)
+            onPressed: snapshot.isValid()
                 ? () {
                     presenter.createInvestment(
                         investmentIdToUpdate: widget.investmentToUpdate?.id);