Skip to content
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.

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

2775 unify naviagation #1979

Merged
merged 4 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,15 @@

<data android:scheme="autonomy-tezos" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:host="navigation"
android:scheme="feralfile" />
</intent-filter>

<!-- Branch App Links -->
<intent-filter android:autoVerify="true">
Expand Down
80 changes: 31 additions & 49 deletions lib/screen/app_router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import 'package:autonomy_flutter/screen/detail/artwork_detail_page.dart';
import 'package:autonomy_flutter/screen/detail/preview/artwork_preview_bloc.dart';
import 'package:autonomy_flutter/screen/detail/preview/artwork_preview_page.dart';
import 'package:autonomy_flutter/screen/detail/preview/canvas_device_bloc.dart';
import 'package:autonomy_flutter/screen/detail/preview/canvas_help_page.dart';
import 'package:autonomy_flutter/screen/detail/preview/keyboard_control_page.dart';
import 'package:autonomy_flutter/screen/detail/preview/touchpad_page.dart';
import 'package:autonomy_flutter/screen/detail/preview_primer.dart';
Expand Down Expand Up @@ -81,7 +80,6 @@ import 'package:autonomy_flutter/screen/irl_screen/webview_irl_screen.dart';
import 'package:autonomy_flutter/screen/migration/key_sync_bloc.dart';
import 'package:autonomy_flutter/screen/migration/key_sync_page.dart';
import 'package:autonomy_flutter/screen/moma_postcard_page/moma_postcard_page.dart';
import 'package:autonomy_flutter/screen/notification_onboarding_page.dart';
import 'package:autonomy_flutter/screen/onboarding/import_address/import_seeds.dart';
import 'package:autonomy_flutter/screen/onboarding/import_address/name_address_persona.dart';
import 'package:autonomy_flutter/screen/onboarding/import_address/select_addresses.dart';
Expand Down Expand Up @@ -110,7 +108,6 @@ import 'package:autonomy_flutter/screen/settings/crypto/wallet_detail/linked_wal
import 'package:autonomy_flutter/screen/settings/crypto/wallet_detail/wallet_detail_bloc.dart';
import 'package:autonomy_flutter/screen/settings/crypto/wallet_detail/wallet_detail_page.dart';
import 'package:autonomy_flutter/screen/settings/data_management/data_management_page.dart';
import 'package:autonomy_flutter/screen/settings/help_us/help_us_page.dart';
import 'package:autonomy_flutter/screen/settings/help_us/inapp_webview.dart';
import 'package:autonomy_flutter/screen/settings/hidden_artworks/hidden_artworks_bloc.dart';
import 'package:autonomy_flutter/screen/settings/hidden_artworks/hidden_artworks_page.dart';
Expand Down Expand Up @@ -142,40 +139,39 @@ GlobalKey<HomeNavigationPageState> homePageKey = GlobalKey();
GlobalKey<HomeNavigationPageState> homePageNoTransactionKey = GlobalKey();

class AppRouter {
static const createPlayListPage = 'createPlayList';
static const viewPlayListPage = 'viewPlayList';
static const editPlayListPage = 'editPlayList';
static const previewPrimerPage = 'preview_primer';
static const onboardingPage = 'onboarding';
static const notificationOnboardingPage = 'notification_onboarding';
static const nameLinkedAccountPage = 'name_linked_account';
static const createPlayListPage = 'create_playlist_page';
static const viewPlayListPage = 'view_playlist_page';
static const editPlayListPage = 'edit_playlist_page';
static const previewPrimerPage = 'preview_primer_page';
static const onboardingPage = 'onboarding_page';
static const nameLinkedAccountPage = 'name_linked_account_page';
static const homePage = 'home_page';
static const homePageNoTransition = 'home_page_NoTransition';
static const artworkPreviewPage = 'artwork_preview';
static const artworkDetailsPage = 'artwork_detail';
static const claimedPostcardDetailsPage = 'claimed_postcard_detail';
static const galleryPage = 'galleryPage';
static const settingsPage = 'settings';
static const personaConnectionsPage = 'persona_connections';
static const connectionDetailsPage = 'connection_details';
static const walletDetailsPage = 'wallet_detail';
static const linkedWalletDetailsPage = 'linked_wallet_detail';
static const scanQRPage = 'qr_scanner';
static const globalReceivePage = 'global_receive';
static const recoveryPhrasePage = 'recovery_phrase';
static const tbConnectPage = 'tb_connect';
static const homePageNoTransition = 'home_page_no_transition';
static const artworkPreviewPage = 'artwork_preview_page';
static const artworkDetailsPage = 'artwork_details_page';
static const claimedPostcardDetailsPage = 'claimed_postcard_details_page';
static const galleryPage = 'gallery_page';
static const settingsPage = 'settings_page';
static const personaConnectionsPage = 'persona_connections_page';
static const connectionDetailsPage = 'connection_details_page';
static const walletDetailsPage = 'wallet_details_page';
static const linkedWalletDetailsPage = 'linked_wallet_details_page';
static const scanQRPage = 'scan_qr_page';
static const globalReceivePage = 'global_receive_page';
static const recoveryPhrasePage = 'recovery_phrase_page';
static const tbConnectPage = 'tb_connect_page';
static const cloudPage = 'cloud_page';
static const cloudAndroidPage = 'cloud_android_page';
static const linkManually = 'link_manually';
static const testArtwork = 'test_artwork';
static const autonomySecurityPage = 'autonomy_security';
static const releaseNotesPage = 'releaseNotesPage';
static const hiddenArtworksPage = 'hidden_artworks';
static const supportCustomerPage = 'supportCustomerPage';
static const supportListPage = 'supportListPage';
static const merchOrdersPage = 'merchOrderDetailPage';
static const supportThreadPage = 'supportThreadPage';
static const bugBountyPage = 'bugBountyPage';
static const autonomySecurityPage = 'security_page';
static const releaseNotesPage = 'release_notes_page';
static const hiddenArtworksPage = 'hidden_artworks_page';
static const supportCustomerPage = 'support_customer_page';
static const supportListPage = 'support_list_page';
static const merchOrdersPage = 'merch_orders_page';
static const supportThreadPage = 'support_thread_page';
static const bugBountyPage = 'bug_bounty_page';
static const keySyncPage = 'key_sync_page';
static const githubDocPage = 'github_doc_page';
static const sendArtworkPage = 'send_artwork_page';
Expand All @@ -186,7 +182,6 @@ class AppRouter {
static const walletPage = 'wallet_page';
static const subscriptionPage = 'subscription_page';
static const dataManagementPage = 'data_management_page';
static const helpUsPage = 'help_us_page';
static const inappWebviewPage = 'inapp_webview_page';
static const postcardExplain = 'postcard_explain_screen';
static const designStamp = 'design_stamp_screen';
Expand All @@ -197,9 +192,8 @@ class AppRouter {
static const payToMintPostcard = 'pay_to_mint_postcard';
static const postcardSelectAddressScreen = 'postcard_select_address_screen';
static const receivePostcardPage = 'receive_postcard_page';
static const irlWebView = 'irl_web_claim';
static const irlWebView = 'irl_web_view';
static const irlSignMessage = 'irl_sign_message';
static const canvasHelpPage = 'canvas_help_page';
static const keyboardControlPage = 'keyboard_control_page';
static const touchPadPage = 'touch_pad_page';
static const postcardLeaderboardPage = 'postcard_leaderboard_page';
Expand Down Expand Up @@ -471,13 +465,6 @@ class AppRouter {
),
);

case notificationOnboardingPage:
return CupertinoPageRoute(
settings: settings,
fullscreenDialog: true,
builder: (context) => const NotificationOnboardingPage(),
);

case AppRouter.testArtwork:
return CupertinoPageRoute(
settings: settings,
Expand Down Expand Up @@ -529,6 +516,7 @@ class AppRouter {
args: settings.arguments! as WCSendTransactionPageArgs),
),
);

case scanQRPage:
return PageTransition(
settings: settings,
Expand Down Expand Up @@ -601,6 +589,7 @@ class AppRouter {
child: WalletDetailPage(
payload: settings.arguments! as WalletDetailsPayload),
));

case linkedWalletDetailsPage:
return CupertinoPageRoute(
settings: settings,
Expand Down Expand Up @@ -1041,9 +1030,6 @@ class AppRouter {
builder: (context) => MultiBlocProvider(providers: [
BlocProvider(create: (_) => identityBloc),
], child: const DataManagementPage()));
case helpUsPage:
return CupertinoPageRoute(
settings: settings, builder: (context) => const HelpUsPage());
case inappWebviewPage:
return PageTransition(
settings: settings,
Expand Down Expand Up @@ -1121,10 +1107,6 @@ class AppRouter {
settings: settings,
builder: (context) => IRLSignMessageScreen(payload: payload));

case canvasHelpPage:
return CupertinoPageRoute(
settings: settings, builder: (context) => const CanvasHelpPage());

case keyboardControlPage:
return TransparentRoute(
settings: settings,
Expand Down
87 changes: 0 additions & 87 deletions lib/screen/detail/preview/canvas_help_page.dart

This file was deleted.

127 changes: 0 additions & 127 deletions lib/screen/notification_onboarding_page.dart

This file was deleted.

Loading
Loading