Skip to content

Commit

Permalink
Merge pull request #1144 from bonomat/fix/remove-feedback-plugin
Browse files Browse the repository at this point in the history
fix: remove feedback plugin
  • Loading branch information
bonomat authored Aug 24, 2023
2 parents c364840 + 19dda11 commit 2a2d950
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 212 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,13 @@ jobs:
run: |
docker-compose up -d
sleep 10 # We need to give docker a bit of time to startup
- name: show disk space before tests
run: df -h
- name: Test containers are up
run: |
curl -d '{"address":"bcrt1qylgu6ffkp3p0m8tw8kp4tt2dmdh755f4r5dq7s", "amount":"0.1"}' -H "Content-Type: application/json" -X POST http://localhost:3000/faucet
- name: Run e2e tests
run: just e2e --nocapture
- name: show disk space after tests
if: always()
run: df -h
69 changes: 0 additions & 69 deletions mobile/lib/common/feedback.dart

This file was deleted.

4 changes: 0 additions & 4 deletions mobile/lib/common/global_keys.dart

This file was deleted.

2 changes: 1 addition & 1 deletion mobile/lib/common/modal_bottom_sheet_info.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class ModalBottomSheetInfo extends StatelessWidget {
),
),
clipBehavior: Clip.antiAliasWithSaveLayer,
useRootNavigator: false,
useRootNavigator: true,
context: context,
builder: (BuildContext context) {
return Container(
Expand Down
14 changes: 0 additions & 14 deletions mobile/lib/common/settings_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import 'dart:convert';
import 'dart:io';

import 'package:f_logs/f_logs.dart';
import 'package:feedback/feedback.dart';
import 'package:flutter/material.dart';
import 'package:get_10101/common/feedback.dart';
import 'package:get_10101/common/scrollable_safe_area.dart';
import 'package:get_10101/bridge_generated/bridge_definitions.dart' as bridge;
import 'package:intl/intl.dart';
Expand Down Expand Up @@ -173,18 +171,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
Share.shareXFiles([logFile], text: 'Logs from $now');
},
child: const Text("Share logs")),
const SizedBox(height: 20),
ElevatedButton(
child: const Text('Provide feedback'),
onPressed: () {
try {
BetterFeedback.of(context).show(submitFeedback);
} on Exception catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Failed to share feedback via email app because: $e')));
}
},
),
])),
);
}
Expand Down
2 changes: 1 addition & 1 deletion mobile/lib/features/trade/trade_bottom_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tradeBottomSheet({required BuildContext context, required Direction direction})
),
clipBehavior: Clip.antiAlias,
isScrollControlled: true,
useRootNavigator: false,
useRootNavigator: true,
context: context,
builder: (BuildContext context) {
return SafeArea(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tradeBottomSheetConfirmation(
),
clipBehavior: Clip.antiAlias,
isScrollControlled: true,
useRootNavigator: false,
useRootNavigator: true,
context: context,
builder: (BuildContext context) {
return SafeArea(
Expand Down
2 changes: 1 addition & 1 deletion mobile/lib/features/trade/trade_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class TradeScreen extends StatelessWidget {
WidgetsBinding.instance.addPostFrameCallback((_) async {
return await showDialog(
context: context,
useRootNavigator: false,
useRootNavigator: true,
barrierDismissible: false, // Prevent user from leaving
builder: (BuildContext context) {
return Selector<SubmitOrderChangeNotifier, PendingOrderState>(
Expand Down
5 changes: 2 additions & 3 deletions mobile/lib/features/wallet/wallet_screen.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_speed_dial/flutter_speed_dial.dart';
import 'package:get_10101/common/amount_text.dart';
import 'package:get_10101/common/global_keys.dart';
import 'package:get_10101/common/submission_status_dialog.dart';
import 'package:get_10101/common/value_data_row.dart';
import 'package:get_10101/features/wallet/seed_screen.dart';
Expand Down Expand Up @@ -49,8 +48,8 @@ class _WalletScreenState extends State<WalletScreen> {
sendPaymentChangeNotifier.pendingPayment!.displayed = true;
WidgetsBinding.instance.addPostFrameCallback((_) async {
return await showDialog(
context: shellNavigatorKey.currentContext!, // Use the context from the navigatorKey
useRootNavigator: false,
context: context,
useRootNavigator: true,
builder: (BuildContext context) {
return Selector<SendPaymentChangeNotifier, PendingPaymentState>(
selector: (_, provider) => provider.pendingPayment!.state,
Expand Down
61 changes: 29 additions & 32 deletions mobile/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import 'dart:convert';
import 'package:f_logs/f_logs.dart';
import 'package:feedback/feedback.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:flutter/material.dart';
import 'package:get_10101/common/global_keys.dart';
import 'package:get_10101/firebase_options.dart';
import 'package:get_10101/common/channel_status_notifier.dart';
import 'dart:io';
Expand Down Expand Up @@ -57,8 +55,8 @@ import 'package:get_10101/features/wallet/domain/wallet_info.dart';
import 'package:get_10101/ffi.dart' as rust;
import 'package:version/version.dart';

final GlobalKey<NavigatorState> _feedbackNavigatorKey =
GlobalKey<NavigatorState>(debugLabel: 'feedback');
final GlobalKey<NavigatorState> _rootNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'root');
final GlobalKey<NavigatorState> _shellNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'shell');

void main() {
WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
Expand Down Expand Up @@ -115,11 +113,11 @@ class _TenTenOneAppState extends State<TenTenOneApp> {
GlobalKey<ScaffoldMessengerState>();

final GoRouter _router = GoRouter(
navigatorKey: rootNavigatorKey,
navigatorKey: _rootNavigatorKey,
initialLocation: WalletScreen.route,
routes: <RouteBase>[
ShellRoute(
navigatorKey: shellNavigatorKey,
navigatorKey: _shellNavigatorKey,
builder: (BuildContext context, GoRouterState state, Widget child) {
return ScaffoldWithNavBar(
child: child,
Expand All @@ -135,39 +133,39 @@ class _TenTenOneAppState extends State<TenTenOneApp> {
GoRoute(
path: SendScreen.subRouteName,
// Use root navigator so the screen overlays the application shell
parentNavigatorKey: rootNavigatorKey,
parentNavigatorKey: _rootNavigatorKey,
builder: (BuildContext context, GoRouterState state) {
return const SendScreen();
},
),
GoRoute(
path: SeedScreen.subRouteName,
// Use root navigator so the screen overlays the application shell
parentNavigatorKey: rootNavigatorKey,
parentNavigatorKey: _rootNavigatorKey,
builder: (BuildContext context, GoRouterState state) {
return const SeedScreen();
},
),
GoRoute(
path: CreateInvoiceScreen.subRouteName,
// Use root navigator so the screen overlays the application shell
parentNavigatorKey: rootNavigatorKey,
parentNavigatorKey: _rootNavigatorKey,
builder: (BuildContext context, GoRouterState state) {
return const CreateInvoiceScreen();
},
routes: [
GoRoute(
path: ShareInvoiceScreen.subRouteName,
// Use root navigator so the screen overlays the application shell
parentNavigatorKey: rootNavigatorKey,
parentNavigatorKey: _rootNavigatorKey,
builder: (BuildContext context, GoRouterState state) {
return ShareInvoiceScreen(invoice: state.extra as ShareInvoice);
},
),
]),
GoRoute(
path: ScannerScreen.subRouteName,
parentNavigatorKey: rootNavigatorKey,
parentNavigatorKey: _rootNavigatorKey,
builder: (BuildContext context, GoRouterState state) {
return const ScannerScreen();
},
Expand All @@ -185,7 +183,7 @@ class _TenTenOneAppState extends State<TenTenOneApp> {
),
GoRoute(
path: WelcomeScreen.route,
parentNavigatorKey: rootNavigatorKey,
parentNavigatorKey: _rootNavigatorKey,
builder: (BuildContext context, GoRouterState state) {
return const WelcomeScreen();
},
Expand Down Expand Up @@ -232,7 +230,7 @@ class _TenTenOneAppState extends State<TenTenOneApp> {
if (coordinatorVersion > clientVersion) {
FLog.warning(text: "Client out of date. Current version: ${clientVersion.toString()}");
showDialog(
context: shellNavigatorKey.currentContext!,
context: _shellNavigatorKey.currentContext!,
builder: (context) => AlertDialog(
title: const Text("Update available"),
content: Text("A new version of 10101 is available: "
Expand All @@ -258,25 +256,24 @@ class _TenTenOneAppState extends State<TenTenOneApp> {
@override
Widget build(BuildContext context) {
MaterialColor swatch = tenTenOnePurple;
return BetterFeedback(
key: _feedbackNavigatorKey,
child: MaterialApp.router(
title: "10101",
scaffoldMessengerKey: scaffoldMessengerKey,
theme: ThemeData(
primarySwatch: swatch,
iconTheme: IconThemeData(
color: tenTenOnePurple.shade800,
size: 32,
),
extensions: <ThemeExtension<dynamic>>[
const TradeTheme(),
WalletTheme(colors: ColorScheme.fromSwatch(primarySwatch: swatch)),
],
),
routerConfig: _router,
debugShowCheckedModeBanner: false,
));

return MaterialApp.router(
title: "10101",
scaffoldMessengerKey: scaffoldMessengerKey,
theme: ThemeData(
primarySwatch: swatch,
iconTheme: IconThemeData(
color: tenTenOnePurple.shade800,
size: 32,
),
extensions: <ThemeExtension<dynamic>>[
const TradeTheme(),
WalletTheme(colors: ColorScheme.fromSwatch(primarySwatch: swatch)),
],
),
routerConfig: _router,
debugShowCheckedModeBanner: false,
);
}

Future<void> init(bridge.Config config) async {
Expand Down
4 changes: 0 additions & 4 deletions mobile/macos/Flutter/GeneratedPluginRegistrant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,20 @@
import FlutterMacOS
import Foundation

import device_info_plus
import firebase_core
import firebase_messaging
import flutter_local_notifications
import package_info_plus
import path_provider_foundation
import share_plus
import shared_preferences_foundation
import url_launcher_macos

func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin"))
FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
}
Loading

0 comments on commit 2a2d950

Please sign in to comment.