Skip to content

Commit

Permalink
fix: 💄 Fix UI/UX
Browse files Browse the repository at this point in the history
  • Loading branch information
redDwarf03 committed Jul 12, 2024
1 parent fb24392 commit 78261fd
Show file tree
Hide file tree
Showing 15 changed files with 177 additions and 70 deletions.
1 change: 1 addition & 0 deletions lib/l10n/intl_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@
"poolDetailsInfoDepositedEquivalent": "Equivalent",
"poolDetailsInfoTVL": "TVL",
"poolDetailsInfoAPR": "APR",
"poolDetailsInfoAPRFarm3Years": "Farming - APR 3 Years",
"time24h": "24h",
"timeAll": "All",
"poolDetailsInfoVolume": "Volume",
Expand Down
4 changes: 0 additions & 4 deletions lib/ui/views/farm_claim/layouts/farm_claim_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import 'package:aedex/domain/models/dex_token.dart';
import 'package:aedex/ui/views/farm_claim/bloc/provider.dart';
import 'package:aedex/ui/views/farm_claim/layouts/components/farm_claim_confirm_sheet.dart';
import 'package:aedex/ui/views/farm_claim/layouts/components/farm_claim_form_sheet.dart';
import 'package:aedex/ui/views/main_screen/bloc/provider.dart';
import 'package:aedex/ui/views/main_screen/layouts/main_screen_sheet.dart';
import 'package:archethic_dapp_framework_flutter/archethic_dapp_framework_flutter.dart'
as aedappfm;
Expand Down Expand Up @@ -38,9 +37,6 @@ class _FarmClaimSheetState extends ConsumerState<FarmClaimSheet> {
super.initState();
Future.delayed(Duration.zero, () async {
try {
ref.read(navigationIndexMainScreenProvider.notifier).state =
NavigationIndex.farm;

await ref
.read(SessionProviders.session.notifier)
.updateCtxInfo(context);
Expand Down
4 changes: 0 additions & 4 deletions lib/ui/views/farm_deposit/layouts/farm_deposit_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'package:aedex/ui/views/farm_deposit/bloc/provider.dart';
import 'package:aedex/ui/views/farm_deposit/layouts/components/farm_deposit_confirm_sheet.dart';
import 'package:aedex/ui/views/farm_deposit/layouts/components/farm_deposit_form_sheet.dart';
import 'package:aedex/ui/views/farm_list/farm_list_sheet.dart';
import 'package:aedex/ui/views/main_screen/bloc/provider.dart';
import 'package:aedex/ui/views/main_screen/layouts/main_screen_sheet.dart';
import 'package:aedex/ui/views/util/components/dex_archethic_uco.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -35,9 +34,6 @@ class _FarmDepositSheetState extends ConsumerState<FarmDepositSheet> {
super.initState();
Future.delayed(Duration.zero, () async {
try {
ref.read(navigationIndexMainScreenProvider.notifier).state =
NavigationIndex.farm;

await ref
.read(SessionProviders.session.notifier)
.updateCtxInfo(context);
Expand Down
4 changes: 0 additions & 4 deletions lib/ui/views/farm_list/farm_list_sheet.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:aedex/application/session/provider.dart';
import 'package:aedex/ui/views/farm_list/bloc/provider.dart';
import 'package:aedex/ui/views/farm_list/components/farm_list_item.dart';
import 'package:aedex/ui/views/main_screen/bloc/provider.dart';
import 'package:aedex/ui/views/main_screen/layouts/main_screen_list.dart';
import 'package:aedex/ui/views/util/components/failure_message.dart';

Expand All @@ -25,9 +24,6 @@ class _FarmListSheetState extends ConsumerState<FarmListSheet> {
@override
void initState() {
Future.delayed(Duration.zero, () async {
ref.read(navigationIndexMainScreenProvider.notifier).state =
NavigationIndex.farm;

await ref.read(SessionProviders.session.notifier).updateCtxInfo(context);

await ref.read(FarmListFormProvider.farmListForm.notifier).getFarmsList(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class FarmLockBlockAprBanner extends ConsumerWidget {
),
if (farmLockForm.farmLock!.apr3years > 0)
Text(
'${farmLockForm.farmLock!.apr3years.formatNumber(precision: 2)}%',
'${(farmLockForm.farmLock!.apr3years * 100).formatNumber(precision: 2)}%',
style: styleBannerText,
)
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,12 @@ class FarmLockBlockFarmedTokensSummary extends ConsumerWidget {
),
Row(
children: [
SelectableText(
'${AppLocalizations.of(context)!.farmLockBlockFarmedTokensSummaryCapitalInvestedLbl}: ',
style: Theme.of(context).textTheme.bodyMedium,
Opacity(
opacity: AppTextStyles.kOpacityText,
child: SelectableText(
'${AppLocalizations.of(context)!.farmLockBlockFarmedTokensSummaryCapitalInvestedLbl}: ',
style: Theme.of(context).textTheme.bodyMedium,
),
),
Opacity(
opacity: opacity,
Expand Down Expand Up @@ -103,9 +106,12 @@ class FarmLockBlockFarmedTokensSummary extends ConsumerWidget {
),
Row(
children: [
SelectableText(
'${AppLocalizations.of(context)!.farmLockBlockFarmedTokensSummaryCapitalRewardsEarnedLbl}: ',
style: Theme.of(context).textTheme.bodyMedium,
Opacity(
opacity: AppTextStyles.kOpacityText,
child: SelectableText(
'${AppLocalizations.of(context)!.farmLockBlockFarmedTokensSummaryCapitalRewardsEarnedLbl}: ',
style: Theme.of(context).textTheme.bodyMedium,
),
),
Opacity(
opacity: opacity,
Expand Down
43 changes: 43 additions & 0 deletions lib/ui/views/farm_lock/components/farm_lock_block_header.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,49 @@ class FarmLockBlockHeader extends ConsumerWidget {
),
],
)
else if (aedappfm.Responsive.isTablet(context))
Column(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
FarmLockBlockAddLiquidity(
pool: pool!,
width: constraints.maxWidth * 0.49,
height: 300,
sortCriteria: sortCriteria,
),
SizedBox(
width: constraints.maxWidth * 0.02,
),
FarmLockBlockEarnRewards(
pool: pool!,
farmLock: farmLock,
farm: farm,
width: constraints.maxWidth * 0.49,
height: 300,
sortCriteria: sortCriteria,
),
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
FarmLockBlockBalanceSummary(
width: constraints.maxWidth * 0.49,
height: 145,
),
SizedBox(
width: constraints.maxWidth * 0.02,
),
FarmLockBlockFarmedTokensSummary(
width: constraints.maxWidth * 0.49,
height: 145,
),
],
),
],
)
else
Column(
crossAxisAlignment: CrossAxisAlignment.start,
Expand Down
4 changes: 0 additions & 4 deletions lib/ui/views/farm_withdraw/layouts/farm_withdraw_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import 'package:aedex/ui/views/farm_list/farm_list_sheet.dart';
import 'package:aedex/ui/views/farm_withdraw/bloc/provider.dart';
import 'package:aedex/ui/views/farm_withdraw/layouts/components/farm_withdraw_confirm_sheet.dart';
import 'package:aedex/ui/views/farm_withdraw/layouts/components/farm_withdraw_form_sheet.dart';
import 'package:aedex/ui/views/main_screen/bloc/provider.dart';
import 'package:aedex/ui/views/main_screen/layouts/main_screen_sheet.dart';
import 'package:aedex/ui/views/util/components/dex_archethic_uco.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -40,9 +39,6 @@ class _FarmWithdrawSheetState extends ConsumerState<FarmWithdrawSheet> {
super.initState();
Future.delayed(Duration.zero, () async {
try {
ref.read(navigationIndexMainScreenProvider.notifier).state =
NavigationIndex.farm;

await ref
.read(SessionProviders.session.notifier)
.updateCtxInfo(context);
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/views/main_screen/bloc/provider.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';

enum NavigationIndex { swap, pool, farm, earn, bridge, getWallet }
enum NavigationIndex { swap, pool, earn, bridge, getWallet }

final navigationIndexMainScreenProvider =
StateProvider.autoDispose<NavigationIndex>((ref) => NavigationIndex.swap);
17 changes: 0 additions & 17 deletions lib/ui/views/main_screen/layouts/bottom_navigation_bar.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'dart:ui';

import 'package:aedex/ui/views/farm_list/farm_list_sheet.dart';
import 'package:aedex/ui/views/farm_lock/farm_lock_sheet.dart';
import 'package:aedex/ui/views/main_screen/bloc/provider.dart';
import 'package:aedex/ui/views/pool_list/pool_list_sheet.dart';
Expand Down Expand Up @@ -72,12 +71,6 @@ class _BottomNavigationBarMainScreenState
selected = true;
}
break;
case aedappfm.Iconsax.coin5:
if (tabSelected == NavigationIndex.farm) {
widthContainer = 30;
selected = true;
}
break;
case aedappfm.Iconsax.coin5:
if (tabSelected == NavigationIndex.earn) {
widthContainer = 30;
Expand Down Expand Up @@ -148,16 +141,6 @@ class _BottomNavigationBarMainScreenState
context.go(PoolListSheet.routerPage);
break;
case 2:
setState(() {
ref
.read(
navigationIndexMainScreenProvider.notifier,
)
.state = NavigationIndex.farm;
});
context.go(FarmListSheet.routerPage);
break;
case 3:
setState(() {
ref
.read(
Expand Down
4 changes: 0 additions & 4 deletions lib/ui/views/main_screen/layouts/main_screen_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ class MainScreenListState extends ConsumerState<MainScreenList> {
aedappfm.Iconsax.wallet_money
),
(AppLocalizations.of(context)!.menu_earn, aedappfm.Iconsax.wallet_add),
(
AppLocalizations.of(context)!.menu_bridge,
aedappfm.Iconsax.recovery_convert
),
];
}

Expand Down
4 changes: 0 additions & 4 deletions lib/ui/views/main_screen/layouts/main_screen_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ class MainScreenSheetState extends ConsumerState<MainScreenSheet> {
aedappfm.Iconsax.wallet_money
),
(AppLocalizations.of(context)!.menu_earn, aedappfm.Iconsax.wallet_add),
(
AppLocalizations.of(context)!.menu_bridge,
aedappfm.Iconsax.recovery_convert
),
];
}

Expand Down
5 changes: 4 additions & 1 deletion lib/ui/views/pool_list/components/pool_details_front.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:aedex/domain/models/dex_pool.dart';
import 'package:aedex/ui/views/pool_list/bloc/provider.dart';
import 'package:aedex/ui/views/pool_list/components/pool_details_info_apr.dart';
import 'package:aedex/ui/views/pool_list/components/pool_details_info_apr_farm.dart';
import 'package:aedex/ui/views/pool_list/components/pool_details_info_buttons.dart';
import 'package:aedex/ui/views/pool_list/components/pool_details_info_fees.dart';
import 'package:aedex/ui/views/pool_list/components/pool_details_info_header.dart';
Expand Down Expand Up @@ -52,7 +53,9 @@ class PoolDetailsFrontState extends ConsumerState<PoolDetailsFront>
PoolDetailsInfoAPR(
tvl: widget.pool.infos?.tvl ?? 0,
fee24h: widget.pool.infos?.fee24h ?? 0,
),
)
else
PoolDetailsInfoAPRFarm(poolAddress: widget.pool.poolAddress),
],
),
const SizedBox(height: 30),
Expand Down
96 changes: 96 additions & 0 deletions lib/ui/views/pool_list/components/pool_details_info_apr_farm.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
import 'package:aedex/application/farm/dex_farm_lock.dart';
import 'package:aedex/application/session/provider.dart';
import 'package:aedex/domain/models/dex_farm_lock.dart';
import 'package:aedex/ui/views/util/app_styles.dart';
import 'package:aedex/ui/views/util/components/pool_farm_available.dart';
import 'package:archethic_dapp_framework_flutter/archethic_dapp_framework_flutter.dart'
as aedappfm;
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/localizations.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';

class PoolDetailsInfoAPRFarm extends ConsumerStatefulWidget {
const PoolDetailsInfoAPRFarm({
required this.poolAddress,
super.key,
});

final String poolAddress;

@override
ConsumerState<PoolDetailsInfoAPRFarm> createState() =>
PoolDetailsInfoAPRFarmState();
}

class PoolDetailsInfoAPRFarmState
extends ConsumerState<PoolDetailsInfoAPRFarm> {
double apr3years = 0;

@override
void initState() {
Future.delayed(Duration.zero, () async {
final env = ref.read(SessionProviders.session).envSelected;
final contextAddresses =
PoolFarmAvailableState().getContextAddresses(env);

final farmLockAddress = contextAddresses.aeETHUCOFarmLockAddress;
if (farmLockAddress.isNotEmpty) {
final farmLock = await ref.read(
DexFarmLockProviders.getFarmLockInfos(
farmLockAddress,
widget.poolAddress,
dexFarmLockInput: DexFarmLock(
poolAddress: widget.poolAddress,
farmAddress: farmLockAddress,
),
).future,
);
setState(() {
apr3years = farmLock!.stats['7']?.aprEstimation ?? 0;
});
}
});
super.initState();
}

@override
Widget build(
BuildContext context,
) {
return Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Row(
children: [
SelectableText(
AppLocalizations.of(context)!.poolDetailsInfoAPRFarm3Years,
style: AppTextStyles.bodyLarge(context),
),
],
),
if (apr3years == 0)
Text(
'__,__%',
style: Theme.of(context).textTheme.headlineMedium!.copyWith(
fontSize: aedappfm.Responsive.fontSizeFromTextStyle(
context,
Theme.of(context).textTheme.headlineMedium!,
),
color: aedappfm.AppThemeBase.secondaryColor,
),
)
else
Text(
'${(apr3years * 100).formatNumber(precision: 2)}%',
style: Theme.of(context).textTheme.headlineMedium!.copyWith(
fontSize: aedappfm.Responsive.fontSizeFromTextStyle(
context,
Theme.of(context).textTheme.headlineMedium!,
),
color: aedappfm.AppThemeBase.secondaryColor,
),
),
],
);
}
}
Loading

0 comments on commit 78261fd

Please sign in to comment.