Skip to content

✨ Improve navigation #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
redDwarf03 wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

✨ Improve navigation #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions lib/ui/views/pool_add/layouts/components/pool_add_form_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'package:aedex/application/session/provider.dart';
import 'package:aedex/ui/views/pool_add/bloc/provider.dart';
import 'package:aedex/ui/views/pool_add/layouts/components/pool_add_textfield_token_1_amount.dart';
import 'package:aedex/ui/views/pool_add/layouts/components/pool_add_textfield_token_2_amount.dart';
import 'package:aedex/ui/views/pool_list/pool_list_sheet.dart';
import 'package:aedex/ui/views/util/app_styles.dart';
import 'package:aedex/ui/views/util/components/failure_message.dart';

Expand Down Expand Up @@ -121,9 +120,7 @@ class PoolAddFormSheet extends ConsumerWidget {
);
} else {
if (!context.mounted) return;
context.go(
'/',
);
context.pop();
}
},
),
Expand All @@ -132,18 +129,7 @@ class PoolAddFormSheet extends ConsumerWidget {
),
aedappfm.ButtonClose(
onPressed: () {
final poolsListTabEncoded = Uri.encodeComponent(
poolAdd.poolsListTab.name,
);

context.go(
Uri(
path: PoolListSheet.routerPage,
queryParameters: {
'tab': poolsListTabEncoded,
},
).toString(),
);
context.pop();
},
),
],
Expand Down
25 changes: 5 additions & 20 deletions lib/ui/views/pool_add/layouts/components/pool_add_in_progress_popup.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'package:aedex/domain/usecases/add_pool.usecase.dart';
import 'package:aedex/ui/views/pool_add/bloc/provider.dart';
import 'package:aedex/ui/views/pool_add/layouts/components/pool_add_in_progress_tx_addresses.dart';
import 'package:aedex/ui/views/pool_list/bloc/provider.dart';
import 'package:aedex/ui/views/pool_list/pool_list_sheet.dart';
import 'package:aedex/ui/views/util/components/failure_message.dart';
import 'package:archethic_dapp_framework_flutter/archethic_dapp_framework_flutter.dart'
as aedappfm;
Expand Down Expand Up @@ -74,43 +73,29 @@ class PoolAddInProgressPopup {
WidgetRef ref,
) {
final poolAdd = ref.watch(PoolAddFormProvider.poolAddForm);
final poolsListTabEncoded = Uri.encodeComponent(poolAdd.poolsListTab.name);

return aedappfm.PopupCloseButton(
warningCloseWarning: poolAdd.isProcessInProgress,
warningCloseLabel: poolAdd.isProcessInProgress == true
? AppLocalizations.of(context)!.poolAddProcessInterruptionWarning
: '',
warningCloseFunction: () {
warningCloseFunction: () async {
ref.invalidate(
PoolAddFormProvider.poolAddForm,
);

if (!context.mounted) return;
Navigator.of(context).pop();
context.go(
Uri(
path: PoolListSheet.routerPage,
queryParameters: {
'tab': poolsListTabEncoded,
},
).toString(),
);
context.pop();
},
closeFunction: () async {
ref.invalidate(
PoolAddFormProvider.poolAddForm,
);

if (!context.mounted) return;
Navigator.of(context).pop();

context.go(
Uri(
path: PoolListSheet.routerPage,
queryParameters: {
'tab': poolsListTabEncoded,
},
).toString(),
);
context.pop();
await ref.read(PoolListFormProvider.poolListForm.notifier).getPoolsList(
tabIndexSelected: poolAdd.poolsListTab,
cancelToken: UniqueKey().toString(),
Expand Down
14 changes: 1 addition & 13 deletions lib/ui/views/pool_add/layouts/pool_add_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/// SPDX-License-Identifier: AGPL-3.0-or-later
import 'package:aedex/application/session/provider.dart';
import 'package:aedex/domain/models/dex_token.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/pool_add/bloc/provider.dart';
import 'package:aedex/ui/views/pool_add/layouts/components/pool_add_confirm_sheet.dart';
import 'package:aedex/ui/views/pool_add/layouts/components/pool_add_form_sheet.dart';
import 'package:aedex/ui/views/pool_list/bloc/provider.dart';
import 'package:aedex/ui/views/pool_list/pool_list_sheet.dart';
import 'package:aedex/ui/views/util/components/dex_archethic_uco.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
Expand Down Expand Up @@ -43,9 +41,6 @@ class _PoolAddSheetState extends ConsumerState<PoolAddSheet> {

if (widget.token1 != null && widget.token2 != null) {
try {
ref.read(navigationIndexMainScreenProvider.notifier).state =
NavigationIndex.pool;

if (context.mounted) {
await ref
.read(PoolAddFormProvider.poolAddForm.notifier)
Expand All @@ -60,14 +55,7 @@ class _PoolAddSheetState extends ConsumerState<PoolAddSheet> {
}
} catch (e) {
if (mounted) {
context.go(
Uri(
path: PoolListSheet.routerPage,
queryParameters: {
'tab': widget.poolsListTab,
},
).toString(),
);
context.pop();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/views/pool_list/components/pool_list_sheet_header.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class _PoolListSheetHeaderState extends ConsumerState<PoolListSheetHeader> {
ref.watch(PoolListFormProvider.poolListForm).tabIndexSelected;

final poolsListTabEncoded = Uri.encodeComponent(selectedTab.name);
context.go(
context.push(
Uri(
path: PoolAddSheet.routerPage,
queryParameters: {
Expand Down
40 changes: 40 additions & 0 deletions lib/ui/views/swap/bloc/provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,46 @@ class SwapFormNotifier extends AutoDisposeNotifier<SwapFormState> {
);
}

Future<bool> isPoolExists() async {
state = state.copyWith(
failure: null,
calculationInProgress: true,
);

final dexConfig =
await ref.read(DexConfigProviders.dexConfigRepository).getDexConfig();
final apiService = aedappfm.sl.get<ApiService>();
final routerFactory =
RouterFactory(dexConfig.routerGenesisAddress, apiService);
final poolInfosResult = await routerFactory.getPoolAddresses(
state.tokenToSwap!.isUCO ? 'UCO' : state.tokenToSwap!.address!,
state.tokenSwapped!.isUCO ? 'UCO' : state.tokenSwapped!.address!,
);
await poolInfosResult.map(
success: (success) async {
if (success != null && success['address'] != null) {
setPoolAddress(success['address']);
await getRatio();
await getPool();
} else {
setPoolAddress('');
setFailure(const aedappfm.PoolNotExists());
state = state.copyWith(ratio: 0, pool: null);
}
},
failure: (failure) {
setPoolAddress('');
setFailure(const aedappfm.PoolNotExists());
state = state.copyWith(ratio: 0, pool: null);
},
);
state = state.copyWith(
calculationInProgress: false,
);

return state.failure == null;
}

Future<void> setTokenSwapped(
DexToken tokenSwapped,
) async {
Expand Down
45 changes: 26 additions & 19 deletions lib/ui/views/swap/layouts/components/swap_form_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,32 @@ class SwapFormSheet extends ConsumerWidget {
swap.tokenToSwap != null &&
swap.tokenSwapped != null &&
swap.tokenToSwap!.address != swap.tokenSwapped!.address)
TextButton.icon(
label: const Text('Create this pool'),
onPressed: () {
final token1Json = jsonEncode(swap.tokenToSwap!.toJson());
final token2Json =
jsonEncode(swap.tokenSwapped!.toJson());
final token1Encoded = Uri.encodeComponent(token1Json);
final token2Encoded = Uri.encodeComponent(token2Json);
context.go(
Uri(
path: PoolAddSheet.routerPage,
queryParameters: {
'token1': token1Encoded,
'token2': token2Encoded,
},
).toString(),
);
},
icon: const Icon(Icons.add),
Padding(
padding: const EdgeInsets.only(bottom: 10),
child: TextButton.icon(
label: const Text('Create this pool'),
onPressed: () async {
final token1Json =
jsonEncode(swap.tokenToSwap!.toJson());
final token2Json =
jsonEncode(swap.tokenSwapped!.toJson());
final token1Encoded = Uri.encodeComponent(token1Json);
final token2Encoded = Uri.encodeComponent(token2Json);
await context.push(
Uri(
path: PoolAddSheet.routerPage,
queryParameters: {
'token1': token1Encoded,
'token2': token2Encoded,
},
).toString(),
);
final swapNotifier =
ref.read(SwapFormProvider.swapForm.notifier);
await swapNotifier.isPoolExists();
},
icon: const Icon(Icons.add),
),
),
aedappfm.ButtonValidate(
controlOk: swap.isControlsOk,
Expand Down