391 commits

Author	SHA1	Message	Date
ryleedavis	05eb6bd20d	set text color for wallet nav	2023-04-05 16:58:27 -06:00
ryleedavis	848336bb07	fix send/receive icon colors for wallet nav bar	2023-04-05 16:45:33 -06:00
julian	81c612ddd7	WIP use Amount	2023-04-05 16:06:31 -06:00
julian	991ade962c	add hover color property to custom containers	2023-04-03 20:19:18 -06:00
julian	728909399c	WIP desktop token view	2023-04-03 17:05:48 -06:00
julian	f10db8306a	add content padding property to SecondaryButton	2023-04-03 17:00:08 -06:00
julian	a9306e5267	use EthTokenIcon class	2023-04-03 16:38:48 -06:00
julian	c530aef112	redo desktop enter wallet gui	2023-04-03 16:22:40 -06:00
julian	5d1ee78452	Merge branch 'ui-fixes' into add-ethereum	2023-04-03 10:38:02 -06:00
julian	4191ec81d3	desktop single field edit gui tweaks	2023-04-03 10:19:18 -06:00
julian	75bfad3471	desktop address list card styling	2023-04-02 13:48:14 -06:00
julian	2458d2912b	WIP desktop add eth token to wallet gui	2023-03-31 14:38:04 -06:00
julian	af460b54a6	token icon based on changenow currency image url	2023-03-30 10:40:35 -06:00
julian	b0d37804fa	token view pop fix	2023-03-28 16:21:26 -06:00
julian	5e5730d5a5	eth token wallet general ui and wallet selection interface	2023-03-28 16:18:11 -06:00
julian	03da868f90	context mounted check	2023-03-28 10:03:47 -06:00
julian	1e6b9e5830	small tweaks	2023-03-27 14:29:30 -06:00
julian	748d70e34f	tx card decimal places fix	2023-03-27 10:38:50 -06:00
julian	e2196c14d4	tx card modification to properly display eth token transaction info	2023-03-27 09:59:57 -06:00
julian	f4d61a9f58	use realAmount custom Amount class data in ui	2023-03-24 17:40:20 -06:00
julian	3e1e68237a	Merge remote-tracking branch 'origin/staging' into add-ethereum ... # Conflicts: # lib/models/isar/models/blockchain_data/address.dart # lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart # lib/pages/settings_views/global_settings_view/appearance_settings_view.dart # lib/pages_desktop_specific/settings/settings_menu/appearance_settings.dart # lib/utilities/db_version_migration.dart # test/pages/send_view/send_view_test.mocks.dart # test/screen_tests/address_book_view/subviews/add_address_book_view_screen_test.mocks.dart # test/screen_tests/address_book_view/subviews/address_book_entry_details_view_screen_test.mocks.dart # test/screen_tests/address_book_view/subviews/edit_address_book_entry_view_screen_test.mocks.dart # test/screen_tests/exchange/exchange_view_test.mocks.dart # test/screen_tests/lockscreen_view_screen_test.mocks.dart # test/screen_tests/main_view_tests/main_view_screen_testA_test.mocks.dart # test/screen_tests/main_view_tests/main_view_screen_testB_test.mocks.dart # test/screen_tests/main_view_tests/main_view_screen_testC_test.mocks.dart # test/screen_tests/onboarding/backup_key_view_screen_test.mocks.dart # test/screen_tests/onboarding/backup_key_warning_view_screen_test.mocks.dart # test/screen_tests/onboarding/create_pin_view_screen_test.mocks.dart # test/screen_tests/onboarding/restore_wallet_view_screen_test.mocks.dart # test/screen_tests/onboarding/verify_backup_key_view_screen_test.mocks.dart # test/screen_tests/settings_view/settings_subviews/currency_view_screen_test.mocks.dart # test/screen_tests/settings_view/settings_subviews/network_settings_subviews/add_custom_node_view_screen_test.mocks.dart # test/screen_tests/settings_view/settings_subviews/network_settings_subviews/node_details_view_screen_test.mocks.dart # test/screen_tests/settings_view/settings_subviews/wallet_backup_view_screen_test.mocks.dart # test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rescan_warning_view_screen_test.mocks.dart # test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/wallet_delete_mnemonic_view_screen_test.mocks.dart # test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart # test/screen_tests/settings_view/settings_view_screen_test.mocks.dart # test/screen_tests/transaction_subviews/transaction_search_results_view_screen_test.mocks.dart # test/screen_tests/wallet_view/confirm_send_view_screen_test.mocks.dart # test/screen_tests/wallet_view/receive_view_screen_test.mocks.dart # test/screen_tests/wallet_view/send_view_screen_test.mocks.dart # test/screen_tests/wallet_view/wallet_view_screen_test.mocks.dart # test/widget_tests/managed_favorite_test.mocks.dart # test/widget_tests/table_view/table_view_row_test.mocks.dart # test/widget_tests/transaction_card_test.mocks.dart # test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.mocks.dart # test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart	2023-03-23 18:13:24 -06:00
julian	702054ac61	Merge remote-tracking branch 'origin/staging' into add-ethereum ... # Conflicts: # assets/svg/themed/forest/ethereum.png # assets/svg/themed/forest/ethereum.svg # lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart # lib/pages/receive_view/addresses/edit_address_label_view.dart # lib/pages/receive_view/addresses/receiving_addresses_view.dart # lib/pages/wallet_view/sub_widgets/wallet_navigation_bar.dart # lib/pages/wallet_view/wallet_view.dart # lib/route_generator.dart # lib/utilities/assets.dart # lib/utilities/constants.dart # lib/widgets/animated_widgets/rotate_icon.dart # pubspec.lock # pubspec.yaml	2023-03-22 08:54:25 -06:00
julian	c35eaf0b0f	WIP address details	2023-03-21 17:18:07 -06:00
julian	d47782a185	mobile wallet nav bar edge color fix	2023-03-17 15:46:49 -06:00
julian	968b93a41c	chan fixes	2023-03-17 12:56:40 -06:00
julian	36d175bcb4	text styles clean up	2023-03-17 08:53:31 -06:00
julian	77f167171f	mobile coin control sort	2023-03-16 16:42:46 -06:00
julian	c856e42322	mobile coin control search	2023-03-16 16:12:16 -06:00
julian	9e0bd2aa35	add optional dropdown prefix label	2023-03-16 12:22:57 -06:00
julian	6f7f9c24eb	desktop coin control	2023-03-16 12:10:59 -06:00
julian	4d083fd3bc	custom dropdown button	2023-03-14 16:27:42 -06:00
julian	b2ce88e33d	WIP desktop utxo details	2023-03-13 17:09:14 -06:00
julian	d0be86f4ba	WIP desktop 'more features' and coin control	2023-03-13 14:37:05 -06:00
julian	da791d483b	wallet nav bar tweaks	2023-03-10 16:48:44 -06:00
julian	244b4992ed	wallet navigation bar widget redesign	2023-03-10 12:42:45 -06:00
julian	043545c758	dialog overflow fix	2023-03-09 10:12:47 -06:00
julian	4c75836b4f	sent to self text clean up	2023-03-08 13:29:05 -06:00
julian	c77993a3e5	update output icon + colors	2023-03-08 11:23:28 -06:00
julian	e40cb3d66d	utxo details ui and edit functionality	2023-03-07 11:11:57 -06:00
Diego Salazar	4aedfc6b1c	Merge pull request #386 from cypherstack/mb-fixes ... Mb fixes	2023-03-03 14:57:49 -07:00
Diego Salazar	5948b79741	Merge pull request #387 from cypherstack/ui-fixes ... doge and firo images + rotating stack icon	2023-03-03 14:57:41 -07:00
julian-CStack	e8e8ffdf60	Merge branch 'staging' into mb-fixes	2023-03-03 15:15:58 -06:00
julian	58227c40be	mb order status fixes	2023-03-03 11:56:21 -06:00
ryleedavis	6fb692da0c	stack icon rotates	2023-03-03 10:27:20 -07:00
sneurlax	40decb2e09	linting	2023-03-02 14:52:22 -06:00
sneurlax	873c56d965	add particl cases to several pages/UI elements	2023-03-02 14:52:17 -06:00
julian	658708da95	add custom icon rotate widget	2023-02-27 17:51:22 -06:00
julian	e3dbc64f17	add custom animation curve param to expandable.dart	2023-02-27 17:25:37 -06:00
julian	97f36e6f04	show sum of total firo public and private balance on wallet select sheet	2023-02-23 11:36:47 -06:00
ryleedavis	9cc367834e	show forest background fix	2023-02-13 16:09:12 -06:00
julian	4b1ff8fd09	added custom button key to pinpad and used it for biometrics reopen	2023-02-13 14:16:47 -06:00
julian	a75d5224e1	custom text button color	2023-02-10 15:16:32 -06:00
sneurlax	44074428a9	Merge branch 'staging' into ui-fixes	2023-02-10 13:55:58 -06:00
sneurlax	23bb519874	Merge branch 'favoritefavorite' into ui-fixes	2023-02-10 11:35:39 -06:00
ryleedavis	8da63b6f3d	add forest theme to background.dart	2023-02-10 09:36:15 -07:00
julian	b1c8a56ba6	aggregate currency	2023-02-08 13:06:26 -06:00
julian	7616538248	exchange form field ui tweak	2023-02-08 11:25:31 -06:00
julian	998967245e	migrate wallet on open	2023-02-08 07:29:27 -06:00
julian	d4db845494	Merge branch 'exchange_refactor' into paynyms ... # Conflicts: # test/pages/send_view/send_view_test.mocks.dart # test/widget_tests/managed_favorite_test.mocks.dart # test/widget_tests/table_view/table_view_row_test.mocks.dart # test/widget_tests/wallet_card_test.mocks.dart # test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.mocks.dart # test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart	2023-02-07 11:17:16 -06:00
julian	f578ce9c0c	clean up	2023-02-06 13:07:49 -06:00
julian	1455808d7a	WIP refactor exchange to use isar as cache instead of in memory using riverpod	2023-02-05 14:32:39 -06:00
julian	a22973cd35	WIP addresses list ui	2023-02-02 15:37:59 -06:00
julian	6a07672437	paynym mobile ui sizing changes	2023-02-01 15:02:41 -06:00
julian	69435f4807	rename and fix text button style update bug	2023-01-30 15:34:21 -06:00
julian	225aec1763	update ui transaction state fix	2023-01-30 12:03:23 -06:00
julian	26c57b5456	typecast to generic PaynymWalletInterface	2023-01-26 10:59:15 -06:00
julian	9c44dc6c6b	add support to make adding segwit paynym support simple once implemented	2023-01-25 14:33:59 -06:00
julian	028b261dee	refactor button style getter names	2023-01-24 13:29:12 -06:00
julian	a0bb793eff	only pad on oceanBreeze theme	2023-01-24 12:17:36 -06:00
julian	7d10ae2011	go directly to wallet view on single wallet per coin on desktop and mobile	2023-01-24 10:16:44 -06:00
ryleedavis	7fe1fefea2	Merge remote-tracking branch 'origin/isar_migrate' into ui-fixes	2023-01-23 17:31:24 -07:00
ryleedavis	90eb0b77c0	WIP: fruit sorbet background	2023-01-23 15:36:13 -07:00
julian	830fd58754	Merge branch 'isar-transactions' into isar_migrate ... # Conflicts: # lib/services/coins/bitcoin/bitcoin_wallet.dart # lib/services/coins/bitcoincash/bitcoincash_wallet.dart # lib/services/coins/coin_service.dart # lib/services/coins/dogecoin/dogecoin_wallet.dart # lib/services/coins/firo/firo_wallet.dart # lib/services/coins/litecoin/litecoin_wallet.dart # lib/services/coins/monero/monero_wallet.dart # lib/services/coins/namecoin/namecoin_wallet.dart # lib/services/coins/particl/particl_wallet.dart # lib/services/coins/wownero/wownero_wallet.dart # pubspec.yaml	2023-01-20 15:30:48 -06:00
julian	9bb71b0e13	firo isar index and null address fix	2023-01-17 12:31:07 -06:00
julian	525d0fa7c4	update remaining ui to handle new data models	2023-01-11 22:45:32 -06:00
julian	f8c6a17fa7	update wallet ui to handle new data models	2023-01-11 22:26:38 -06:00
julian	30d8f8b810	update isCancelled flag name to be consistent with other isar model bool values	2023-01-11 14:48:55 -06:00
julian	e7877358da	temp. branching of transaction model type for dogecoin wallets	2023-01-10 17:53:09 -06:00
julian	91696ebb4b	desktop paynym details subview	2023-01-09 13:15:15 -06:00
julian	5a77efe5f8	update button to use proper icons	2023-01-06 17:40:15 -06:00
ryleedavis	23e3452cf1	oledBlack theme added to desktop	2023-01-06 09:12:01 -07:00
julian	ca4cdd40c0	paynym card refactor and paynym details popup for mobile WIP	2023-01-05 16:19:02 -06:00
julian	d957cad4ba	add copy constructor and properly update paynym account model, as well as fix desktop navigation on follow/unfollow	2023-01-04 14:56:36 -06:00
julian	f30c82c748	button height fix	2023-01-04 13:01:51 -06:00
julian	07addeadd8	refactor paynym toggle follow button	2023-01-04 12:47:41 -06:00
julian	a6cc955090	paynym desktop search button	2023-01-04 12:32:10 -06:00
julian	f9491f8215	Merge branch 'xmr-sync' into paynyms ... # Conflicts: # lib/utilities/enums/coin_enum.dart	2023-01-02 13:47:10 -06:00
julian	838678eb06	mobile xmr/wow loading fix	2023-01-02 11:08:13 -06:00
julian	1691ff8402	mac desktop keyboard type crash fix	2022-12-30 11:36:00 -06:00
julian	7631d3f3c6	WIP follow/unfollow	2022-12-21 17:02:14 -06:00
julian	2297fbf028	add (follow) new paynym view	2022-12-21 13:46:50 -06:00
julian	3b6d53d685	WIP paynym home view	2022-12-21 10:17:53 -06:00
julian	236e04f849	epic node changes and fixes	2022-12-12 15:59:06 -06:00
julian	820efa4d8b	fix theme updating desktop appbar children	2022-12-05 16:41:46 -06:00
julian	4593f7a0dc	fix desktop wallet name field	2022-12-05 16:36:28 -06:00
julian	ef8f38aeb8	fix wallets not showing up when more than 1 of the same type are created	2022-12-05 16:10:18 -06:00
julian	779bf20cc4	desktop trade steps flow fade transition and state management updates	2022-11-30 15:23:26 -06:00
julian	2476aa4d1f	trade details scroll on small desktop screens	2022-11-29 14:56:14 -06:00
julian	07ba82ace0	desktop hover color for blue text button	2022-11-29 12:08:10 -06:00
julian	f04018dbe6	exchange rate type toggle animated effect	2022-11-29 09:42:46 -06:00
julian	178565a190	date picker file license added	2022-11-28 15:43:35 -06:00
julian	d7cd5cb8a9	desktop wallets table hover effects	2022-11-28 15:37:57 -06:00
ryleedavis	b4cbf078c7	flutter_rounded_date_picker files from picker lib	2022-11-28 13:51:16 -07:00
julian	c3921b01de	animated desktop stack icon	2022-11-28 14:25:57 -06:00
julian	56f54ac487	clean up and test fixes	2022-11-25 17:49:47 -06:00
julian	4b0d44a239	emoji search	2022-11-25 16:49:43 -06:00
julian	276d08d22f	allow default node deletion if other nodes exist	2022-11-25 14:28:53 -06:00
julian	42aad5dcd5	themed background gradient option and background image, as well as various button height fixes for mobile	2022-11-25 13:24:01 -06:00
julian	adee71224b	Format coin amounts improvements, fixed fee rates display issue, use hard coded xmr estimates for now	2022-11-23 12:42:23 -06:00
julian	140e68948f	uppercase tickers on exchange form coin select field buttons	2022-11-23 08:26:03 -06:00
julian	8e2ff3883d	exchange amount field re style	2022-11-22 14:42:34 -06:00
julian	7afe6940f9	desktop trade history details updated	2022-11-22 08:07:22 -06:00
julian	a8faa7b8e7	exchange form desktop routing and dialogs	2022-11-19 13:20:03 -06:00
julian	aa966a106d	add delete contact functionality for desktop	2022-11-18 10:22:43 -06:00
julian	11735cdaf7	desktop emoji select	2022-11-17 16:18:07 -06:00
julian	1d238c29f0	WIP: centralize button heights	2022-11-17 12:01:52 -06:00
julian	9e7c1ccf9d	button size enum	2022-11-17 11:46:52 -06:00
julian	81d5f757b3	WIP: desktop contact details	2022-11-17 11:10:26 -06:00
julian	b988342bb1	"send from" contact card fix	2022-11-17 10:12:59 -06:00
julian	72248d6a64	expandable fix	2022-11-17 10:12:19 -06:00
julian	f66b780e53	desktop popup edge color fix	2022-11-16 12:09:19 -06:00
julian	07cf1f3f92	Add MouseRegion to Expandable widget and clean up duplications	2022-11-15 16:44:43 -06:00
ryleedavis	2ec1bda6f2	desktop address book contact buttons	2022-11-15 13:45:06 -07:00
julian	af47c67231	BranchedParent class	2022-11-09 17:55:34 -06:00
ryleedavis	cc779be460	enable and disable auto back up	2022-11-09 15:32:39 -07:00
julian	cede571350	desktop login/password screen	2022-11-08 15:38:53 -06:00
julian	f17785ffc7	monero/wownero untrusted cert popup	2022-11-08 10:18:48 -06:00
julian	bed25b37f7	desktop node management ui	2022-11-03 18:12:07 -06:00
julian	e0a8f32d69	desktop wallet network settings expanding node cards	2022-11-02 16:14:26 -06:00
julian	2afec92279	desktop wallet network settings expanding advanced rescan	2022-11-02 16:14:26 -06:00
julian	fc981ef6e0	AddressBookAddressChooser search and ui tweaks	2022-11-02 10:01:17 -06:00
julian	fc25ea2a24	fix previous failing widget tests	2022-11-02 08:49:19 -06:00
julian	4d8804f78b	WIP desktop send flow address book address chooser	2022-11-01 15:58:53 -06:00
julian	3421602ba2	manually toggleable expandable mod	2022-10-31 11:51:16 -06:00
julian	817460b5e1	proper conditional parent widget class to handle some desktop/mobile differences in a cleaner manner	2022-10-31 11:32:22 -06:00
julian	b3b8d0b057	added more customization options to AppBarBackButton	2022-10-31 09:45:42 -06:00
julian	c9220c5c11	desktop wallet renaming	2022-10-30 11:13:32 -06:00
julian	5fd47de9a2	desktop tx details + edit note ui	2022-10-29 13:35:03 -06:00
julian	180b18e1c8	Merge branch 'staging' into desktop ... # Conflicts: # lib/pages/stack_privacy_calls.dart	2022-10-28 16:59:59 -06:00
Marco	d75f2ed13d	another node switching bug	2022-10-28 15:50:40 -06:00
julian	3a15538273	WIP: desktop wallet keys popup layouts	2022-10-28 13:51:25 -06:00
julian	ec7840419f	desktop dialog mod to allow setting max size	2022-10-27 15:23:31 -06:00
julian	934cdcc917	WIP: desktop transactions list	2022-10-27 13:26:55 -06:00
julian	51b6a95390	medium desktop buttons	2022-10-27 11:05:23 -06:00
julian	d365614533	desktop send fields restyle	2022-10-27 10:51:56 -06:00
Rylee Davis	4904f75dfb	Merge branch 'desktop' into staging	2022-10-26 16:48:41 -06:00
julian	64ca94ddfb	fix nodes connect button color	2022-10-20 10:21:42 -06:00
Marco	2ee8dd417a	Merge branch 'flutter3.3.4' into desktop ... # Conflicts: # lib/pages/stack_privacy_calls.dart # lib/utilities/prefs.dart	2022-10-19 09:29:32 -06:00
julian	643e0640c9	hide price values on tx card+details view when incognito mode enabled	2022-10-17 16:07:40 -06:00
julian	7e6edd4dab	desktop basic wallet layout ui	2022-10-13 13:07:48 -06:00
Marco	5707a846b4	Merge branch 'staging' into testing-exchange	2022-10-10 11:59:33 -06:00
Marco	4339c19631	easy or more private option added at startup	2022-10-09 21:36:43 -06:00
julian	58deb850f2	move from the changenow specific ExchangeTransaction model to Using the generic Trade model	2022-10-02 18:54:35 -06:00
julian	6f594ade52	wownero 11 decimal places fixes	2022-09-28 17:15:16 -06:00
julian	7b3b7554b0	wownero node and ui fixes	2022-09-28 09:17:16 -06:00
julian	243f2e4291	Desktop manage favorite wallets	2022-09-26 14:21:13 -06:00
julian	944bee890e	text styles font based on theme	2022-09-26 11:34:41 -06:00
julian	fb0908840d	finished up desktop restore from mnemonic flow	2022-09-26 10:13:15 -06:00
julian	1fa65d92a8	standardized buttons, desktop dialog/alert outline, restore wallet request dialog	2022-09-26 09:49:36 -06:00
julian	bd5711e098	desktop restore layout	2022-09-25 13:53:08 -06:00
julian	799f1be602	add spacing option to tableview row items	2022-09-25 11:25:57 -06:00
julian	f45449f3d2	style fixes	2022-09-24 15:52:03 -06:00
julian	4e0c99c6f7	dynamic themed icons	2022-09-23 08:34:22 -06:00
julian	a8d656338a	theme context initState fix	2022-09-22 18:20:07 -06:00
julian	f26bd5a813	no submit pin button	2022-09-22 18:20:04 -06:00
julian	15739a22f8	dark mode toggle and color theme persistence	2022-09-22 17:48:50 -06:00
julian	598dfcbe38	live color theme toggle	2022-09-22 16:17:21 -06:00
julian	dd122e3610	A few more color fixes	2022-09-22 14:27:13 -06:00
julian	01adeda61b	light color and various other fixes	2022-09-22 11:43:44 -06:00
julian	2edc0c1102	copy and favorited star icon color fix	2022-09-22 08:45:24 -06:00
julian	61e9b8715f	long wallet name clipping fix	2022-09-21 17:32:06 -06:00
julian	f25d9eecef	remove CFColors and some more dark color fixes	2022-09-21 16:49:48 -06:00
julian	e830286511	Color theming mostly done with dark colors	2022-09-21 15:59:52 -06:00
julian	7d3a9bf0d9	home + pinpad dark colors	2022-09-21 11:59:18 -06:00
julian	1ae035bca1	WIP theme coloring	2022-09-20 18:46:07 -06:00
julian	79cc82f379	wallets table scrolling and spacing fixes	2022-09-19 14:39:18 -06:00
julian	b0c179666c	standardize isDesktop check	2022-09-19 14:18:31 -06:00
julian	166b5e827b	fix icon size	2022-09-19 13:37:01 -06:00
julian	40f6acda2e	added desktop menu icons	2022-09-19 13:34:27 -06:00
julian	79327a145c	simple tableview with optional expandable rows	2022-09-19 11:37:27 -06:00
julian	e2bd064ba5	simple expandable widget	2022-09-19 11:34:43 -06:00
julian	4c2a096174	refactor wallet card/wallet info row	2022-09-19 11:32:33 -06:00
julian	f63acf4fa7	recovery warning desktop ui	2022-09-18 11:27:38 -06:00
julian	3047a90b41	wallet name layout for desktop	2022-09-18 10:51:42 -06:00
julian	c28e188c8f	desktop reusable widgets and create/restore flow ui	2022-09-18 10:14:27 -06:00
julian	95d37c9c28	add wallet desktop view	2022-09-16 17:54:46 -06:00
julian	28916a9b93	desktop colors, text styles, and some ui element platform specific checks	2022-09-15 13:48:28 -06:00
julian	73ae1c7c90	Handle clipping of long wallet names on the wallet selection sheet	2022-09-14 15:52:34 -06:00
julian	fbc398bc14	WIP firo redesign	2022-09-06 17:27:14 -06:00
julian	d84cde3db6	upcoming firo functionality assets and some linter warning clean up	2022-09-06 15:51:22 -06:00
Marco	b41d31fd32	first commit	2022-08-26 16:11:35 +08:00