Merge remote-tracking branch 'mrcyjanex/cyjan-monerodartv2' into monerodart_testing

This commit is contained in:
sneurlax 2024-05-01 15:52:18 -05:00
commit 1bbb08b433
5 changed files with 25 additions and 20 deletions

View file

@ -212,12 +212,8 @@ void main(List<String> args) async {
} }
} }
if (!Platform.isWindows) { monero.onStartup();
monero.onStartup(); wownero.onStartup();
}
if (!Platform.isLinux && !Platform.isWindows) {
wownero.onStartup();
}
// SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, // SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
// overlays: [SystemUiOverlay.bottom]); // overlays: [SystemUiOverlay.bottom]);

View file

@ -127,12 +127,6 @@ class _AddWalletViewState extends ConsumerState<AddWalletView> {
_searchFieldController = TextEditingController(); _searchFieldController = TextEditingController();
_searchFocusNode = FocusNode(); _searchFocusNode = FocusNode();
// _coinsTestnet.remove(Coin.firoTestNet); // _coinsTestnet.remove(Coin.firoTestNet);
if (Platform.isWindows) {
_coins.remove(Coin.monero);
_coins.remove(Coin.wownero);
} else if (Platform.isLinux) {
// _coins.remove(Coin.wownero);
}
// Remove FROST from the list of coins based on our frostEnabled preference. // Remove FROST from the list of coins based on our frostEnabled preference.
if (!ref.read(prefsChangeNotifierProvider).frostEnabled) { if (!ref.read(prefsChangeNotifierProvider).frostEnabled) {

View file

@ -65,12 +65,6 @@ class _NodesSettings extends ConsumerState<NodesSettings> {
void initState() { void initState() {
_coins = _coins.toList(); _coins = _coins.toList();
_coins.remove(Coin.firoTestNet); _coins.remove(Coin.firoTestNet);
if (Platform.isWindows) {
_coins.remove(Coin.monero);
_coins.remove(Coin.wownero);
} else if (Platform.isLinux) {
// _coins.remove(Coin.wownero);
}
searchNodeController = TextEditingController(); searchNodeController = TextEditingController();
searchNodeFocusNode = FocusNode(); searchNodeFocusNode = FocusNode();

View file

@ -1197,8 +1197,8 @@ packages:
dependency: transitive dependency: transitive
description: description:
path: "." path: "."
ref: "7ba955fd9d975c7228ee43a744294399b48f9993" ref: "6a17a405a1a260fa228b2f4fc94044088a4335ac"
resolved-ref: "7ba955fd9d975c7228ee43a744294399b48f9993" resolved-ref: "6a17a405a1a260fa228b2f4fc94044088a4335ac"
url: "https://git.mrcyjanek.net/mrcyjanek/monero.dart" url: "https://git.mrcyjanek.net/mrcyjanek/monero.dart"
source: git source: git
version: "0.0.0" version: "0.0.0"

View file

@ -86,6 +86,27 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libepiccash
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_liblelantus/scripts/windows/build/libmobileliblelantus.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_liblelantus/scripts/windows/build/libmobileliblelantus.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
COMPONENT Runtime) COMPONENT Runtime)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/x86_64-w64-mingw32_libwallet2_api_c.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "monero_libwallet2_api_c.dll"
COMPONENT Runtime)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libwallet2_api_c.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "wownero_libwallet2_api_c.dll"
COMPONENT Runtime)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libgcc_s_seh-1.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libgcc_s_seh-1.dll"
COMPONENT Runtime)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libpolyseed.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libpolyseed.dll"
COMPONENT Runtime)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libssp-0.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libssp-0.dll"
COMPONENT Runtime)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libstdc++-6.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libstdc++-6.dll"
COMPONENT Runtime)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libwinpthread-1.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libwinpthread-1.dll"
COMPONENT Runtime)
if(PLUGIN_BUNDLED_LIBRARIES) if(PLUGIN_BUNDLED_LIBRARIES)
install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"