From 89c28a2d9d3e1f4d43ce732ce586bbc1bde5509c Mon Sep 17 00:00:00 2001 From: julian Date: Thu, 8 Jun 2023 13:24:35 -0600 Subject: [PATCH] re enable git versions --- .../global_settings_view/about_view.dart | 31 +++++++------- .../advanced_views/debug_view.dart | 12 +++--- .../settings_menu/desktop_about_view.dart | 41 +++++++++---------- 3 files changed, 39 insertions(+), 45 deletions(-) diff --git a/lib/pages/settings_views/global_settings_view/about_view.dart b/lib/pages/settings_views/global_settings_view/about_view.dart index 98a381316..5daa1e81a 100644 --- a/lib/pages/settings_views/global_settings_view/about_view.dart +++ b/lib/pages/settings_views/global_settings_view/about_view.dart @@ -12,11 +12,11 @@ import 'dart:convert'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -// import 'package:flutter_libepiccash/git_versions.dart' as EPIC_VERSIONS; -// import 'package:flutter_libmonero/git_versions.dart' as MONERO_VERSIONS; +import 'package:flutter_libepiccash/git_versions.dart' as EPIC_VERSIONS; +import 'package:flutter_libmonero/git_versions.dart' as MONERO_VERSIONS; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:http/http.dart'; -// import 'package:lelantus/git_versions.dart' as FIRO_VERSIONS; +import 'package:lelantus/git_versions.dart' as FIRO_VERSIONS; import 'package:package_info_plus/package_info_plus.dart'; import 'package:stackwallet/themes/stack_colors.dart'; import 'package:stackwallet/utilities/logger.dart'; @@ -115,12 +115,9 @@ class AboutView extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - String firoCommit = - "Unable to fetch version"; //FIRO_VERSIONS.getPluginVersion(); - String epicCashCommit = - "Unable to fetch version"; // EPIC_VERSIONS.getPluginVersion(); - String moneroCommit = - "Unable to fetch version"; // MONERO_VERSIONS.getPluginVersion(); + String firoCommit = FIRO_VERSIONS.getPluginVersion(); + String epicCashCommit = EPIC_VERSIONS.getPluginVersion(); + String moneroCommit = MONERO_VERSIONS.getPluginVersion(); List futureFiroList = [ doesCommitExist("cypherstack", "flutter_liblelantus", firoCommit), isHeadCommit("cypherstack", "flutter_liblelantus", "main", firoCommit), @@ -174,14 +171,14 @@ class AboutView extends ConsumerWidget { String appName = ""; String build = ""; - // if (snapshot.connectionState == - // ConnectionState.done && - // snapshot.hasData) { - // version = snapshot.data!.version; - // build = snapshot.data!.buildNumber; - // signature = snapshot.data!.buildSignature; - // appName = snapshot.data!.appName; - // } + if (snapshot.connectionState == + ConnectionState.done && + snapshot.hasData) { + version = snapshot.data!.version; + build = snapshot.data!.buildNumber; + signature = snapshot.data!.buildSignature; + appName = snapshot.data!.appName; + } return Column( crossAxisAlignment: CrossAxisAlignment.stretch, diff --git a/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart b/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart index 488b018d7..622a4cafe 100644 --- a/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart +++ b/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart @@ -17,11 +17,11 @@ import 'package:event_bus/event_bus.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -// import 'package:flutter_libepiccash/git_versions.dart' as EPIC_VERSIONS; -// import 'package:flutter_libmonero/git_versions.dart' as MONERO_VERSIONS; +import 'package:flutter_libepiccash/git_versions.dart' as EPIC_VERSIONS; +import 'package:flutter_libmonero/git_versions.dart' as MONERO_VERSIONS; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; -// import 'package:lelantus/git_versions.dart' as FIRO_VERSIONS; +import 'package:lelantus/git_versions.dart' as FIRO_VERSIONS; import 'package:package_info_plus/package_info_plus.dart'; import 'package:stackwallet/models/isar/models/log.dart'; import 'package:stackwallet/notifications/show_flush_bar.dart'; @@ -302,11 +302,11 @@ class _DebugViewState extends ConsumerState { packageInfo.buildSignature; final appName = packageInfo.appName; String firoCommit = - "Unable to fetch version"; //FIRO_VERSIONS.getPluginVersion(); + FIRO_VERSIONS.getPluginVersion(); String epicCashCommit = - "Unable to fetch version"; //EPIC_VERSIONS.getPluginVersion(); + EPIC_VERSIONS.getPluginVersion(); String moneroCommit = - "Unable to fetch version"; // MONERO_VERSIONS.getPluginVersion(); + MONERO_VERSIONS.getPluginVersion(); DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin(); final deviceInfo = diff --git a/lib/pages_desktop_specific/settings/settings_menu/desktop_about_view.dart b/lib/pages_desktop_specific/settings/settings_menu/desktop_about_view.dart index f65e0170f..a54c0f443 100644 --- a/lib/pages_desktop_specific/settings/settings_menu/desktop_about_view.dart +++ b/lib/pages_desktop_specific/settings/settings_menu/desktop_about_view.dart @@ -12,11 +12,11 @@ import 'dart:convert'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -// import 'package:flutter_libepiccash/git_versions.dart' as EPIC_VERSIONS; -// import 'package:flutter_libmonero/git_versions.dart' as MONERO_VERSIONS; +import 'package:flutter_libepiccash/git_versions.dart' as EPIC_VERSIONS; +import 'package:flutter_libmonero/git_versions.dart' as MONERO_VERSIONS; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:http/http.dart'; -// import 'package:lelantus/git_versions.dart' as FIRO_VERSIONS; +import 'package:lelantus/git_versions.dart' as FIRO_VERSIONS; import 'package:package_info_plus/package_info_plus.dart'; import 'package:stackwallet/themes/stack_colors.dart'; import 'package:stackwallet/utilities/logger.dart'; @@ -108,12 +108,9 @@ class DesktopAboutView extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - String firoCommit = - "Unable to fetch version"; // FIRO_VERSIONS.getPluginVersion(); - String epicCashCommit = - "Unable to fetch version"; // EPIC_VERSIONS.getPluginVersion(); - String moneroCommit = - "Unable to fetch version"; //MONERO_VERSIONS.getPluginVersion(); + String firoCommit = FIRO_VERSIONS.getPluginVersion(); + String epicCashCommit = EPIC_VERSIONS.getPluginVersion(); + String moneroCommit = MONERO_VERSIONS.getPluginVersion(); List futureFiroList = [ doesCommitExist("cypherstack", "flutter_liblelantus", firoCommit), isHeadCommit("cypherstack", "flutter_liblelantus", "main", firoCommit), @@ -250,13 +247,13 @@ class DesktopAboutView extends ConsumerWidget { String signature = ""; String build = ""; - // if (snapshot.connectionState == - // ConnectionState.done && - // snapshot.hasData) { - // version = snapshot.data!.version; - // build = snapshot.data!.buildNumber; - // signature = snapshot.data!.buildSignature; - // } + if (snapshot.connectionState == + ConnectionState.done && + snapshot.hasData) { + version = snapshot.data!.version; + build = snapshot.data!.buildNumber; + signature = snapshot.data!.buildSignature; + } return Column( mainAxisAlignment: @@ -404,7 +401,7 @@ class DesktopAboutView extends ConsumerWidget { .accentColorGreen); break; case CommitStatus - .isOldCommit: + .isOldCommit: indicationStyle = STextStyles .itemSubtitle( context) @@ -416,7 +413,7 @@ class DesktopAboutView extends ConsumerWidget { .accentColorYellow); break; case CommitStatus - .notACommit: + .notACommit: indicationStyle = STextStyles .itemSubtitle( context) @@ -510,7 +507,7 @@ class DesktopAboutView extends ConsumerWidget { .accentColorGreen); break; case CommitStatus - .isOldCommit: + .isOldCommit: indicationStyle = STextStyles .itemSubtitle( context) @@ -522,7 +519,7 @@ class DesktopAboutView extends ConsumerWidget { .accentColorYellow); break; case CommitStatus - .notACommit: + .notACommit: indicationStyle = STextStyles .itemSubtitle( context) @@ -614,7 +611,7 @@ class DesktopAboutView extends ConsumerWidget { .accentColorGreen); break; case CommitStatus - .isOldCommit: + .isOldCommit: indicationStyle = STextStyles .itemSubtitle( context) @@ -626,7 +623,7 @@ class DesktopAboutView extends ConsumerWidget { .accentColorYellow); break; case CommitStatus - .notACommit: + .notACommit: indicationStyle = STextStyles .itemSubtitle( context)