From 8142e3659dd851efeb8573dcd556823a05b5cd6f Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sun, 20 Nov 2022 10:31:06 +0000 Subject: [PATCH] mightier amp: update patch for release 24 (0.9.5) --- metadata/com.tuntori.mightieramp.yml | 6 +- ...import_for_case_sensitive_filesystems.diff | 13 ++ .../remove_youtube_sentry_support_24.diff | 157 ++++++++++++++++++ 3 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 metadata/com.tuntori.mightieramp/fix_import_for_case_sensitive_filesystems.diff create mode 100644 metadata/com.tuntori.mightieramp/remove_youtube_sentry_support_24.diff diff --git a/metadata/com.tuntori.mightieramp.yml b/metadata/com.tuntori.mightieramp.yml index fbc85895a4..c920f43308 100644 --- a/metadata/com.tuntori.mightieramp.yml +++ b/metadata/com.tuntori.mightieramp.yml @@ -50,13 +50,13 @@ Builds: - versionName: 0.9.5 versionCode: 24 - disable: patch error commit: 8a257fb6e3d42772ed202452deacadaf68b1d2c1 patch: - - remove_youtube_sentry_support_17.diff + - remove_youtube_sentry_support_24.diff + - fix_import_for_case_sensitive_filesystems.diff output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@2.10.1 + - flutter@3.3.8 rm: - ios prebuild: diff --git a/metadata/com.tuntori.mightieramp/fix_import_for_case_sensitive_filesystems.diff b/metadata/com.tuntori.mightieramp/fix_import_for_case_sensitive_filesystems.diff new file mode 100644 index 0000000000..2af87a1aff --- /dev/null +++ b/metadata/com.tuntori.mightieramp/fix_import_for_case_sensitive_filesystems.diff @@ -0,0 +1,13 @@ +diff --git a/lib/bluetooth/devices/value_formatters/ValueFormatter.dart b/lib/bluetooth/devices/value_formatters/ValueFormatter.dart +index f525c55..351e83e 100644 +--- a/lib/bluetooth/devices/value_formatters/ValueFormatter.dart ++++ b/lib/bluetooth/devices/value_formatters/ValueFormatter.dart +@@ -2,7 +2,7 @@ import 'package:mighty_plug_manager/bluetooth/devices/value_formatters/Frequency + import 'package:mighty_plug_manager/bluetooth/devices/value_formatters/SwitchFormatters.dart'; + + import 'TempoFormatter.dart'; +-import 'decibelFormatter.dart'; ++import 'DecibelFormatter.dart'; + import 'PercentageFormatter.dart'; + + enum InputType { SliderInput, SwitchInput } diff --git a/metadata/com.tuntori.mightieramp/remove_youtube_sentry_support_24.diff b/metadata/com.tuntori.mightieramp/remove_youtube_sentry_support_24.diff new file mode 100644 index 0000000000..7c163fb5d1 --- /dev/null +++ b/metadata/com.tuntori.mightieramp/remove_youtube_sentry_support_24.diff @@ -0,0 +1,157 @@ +diff --git a/lib/audio/tracksPage.dart b/lib/audio/tracksPage.dart +index 70b251b..08c2f79 100644 +--- a/lib/audio/tracksPage.dart ++++ b/lib/audio/tracksPage.dart +@@ -12,7 +12,6 @@ import 'package:path/path.dart'; + import '../platform/simpleSharedPrefs.dart'; + import 'audioEditor.dart'; + import 'models/jamTrack.dart'; +-import 'online_sources/YoutubeSource.dart'; + import 'online_sources/onlineTrack.dart'; + import 'trackdata/trackData.dart'; + import 'widgets/online_source/online_source.dart'; +@@ -344,25 +343,6 @@ class _TracksPageState extends State + }); + } + +- void addFromYoutubeSource(BuildContext context) { +- Navigator.of(context) +- .push(MaterialPageRoute( +- builder: (context) => OnlineSearchScreen(source: YoutubeSource()))) +- .then((value) { +- if (value is List) { +- for (int i = 0; i < value.length; i++) { +- var name = "${value[i].artist} - ${value[i].title}"; +- TrackData().addTrack(value[i].url, name, false); +- } +- TrackData().saveTracks(); +- //clear filter and scroll to bottom +- searchCtrl.text = ""; +- setState(() {}); +- _scollToNewSongs(); +- } +- }); +- } +- + void _scollToNewSongs() async { + await Future.delayed(const Duration(milliseconds: 300)); + scrollController.animateTo(scrollController.position.maxScrollExtent, +@@ -467,17 +447,6 @@ class _TracksPageState extends State + List _bubbles(BuildContext context) { + return [ + // Floating action menu item +- if (_showHiddenSources) +- Bubble( +- title: "Youtube", +- iconColor: Colors.white, +- bubbleColor: Colors.red, +- icon: Icons.ondemand_video_outlined, +- titleStyle: const TextStyle(fontSize: 16, color: Colors.white), +- onPress: () { +- _animationController.reverse(); +- addFromYoutubeSource(context); +- }), + if (_showHiddenSources) + Bubble( + title: "Online Source", +diff --git a/lib/bluetooth/NuxDeviceControl.dart b/lib/bluetooth/NuxDeviceControl.dart +index 4fa08a2..bb14123 100644 +--- a/lib/bluetooth/NuxDeviceControl.dart ++++ b/lib/bluetooth/NuxDeviceControl.dart +@@ -8,7 +8,6 @@ import 'package:flutter/material.dart'; + import 'package:flutter_blue_plus/flutter_blue_plus.dart'; + import 'package:mighty_plug_manager/bluetooth/devices/NuxMighty8BT.dart'; + import 'package:mighty_plug_manager/platform/simpleSharedPrefs.dart'; +-import 'package:sentry_flutter/sentry_flutter.dart'; + import 'package:undo/undo.dart'; + + import 'bleMidiHandler.dart'; +@@ -484,12 +483,6 @@ class NuxDeviceControl extends ChangeNotifier { + + diagData.device = "${_device.productName} ${_device.productVersion}"; + if (connected != null) diagData.connected = connected; +- +- Sentry.configureScope((scope) { +- scope.setTag( +- "nuxDevice", "${_device.productName} ${_device.productVersion}"); +- scope.setContexts('NUX', diagData.toMap(includeJsonPreset)); +- }); + } + + NuxDevice get device => _device; +diff --git a/lib/main.dart b/lib/main.dart +index 4688361..37e7962 100644 +--- a/lib/main.dart ++++ b/lib/main.dart +@@ -12,7 +12,6 @@ import 'package:mighty_plug_manager/UI/widgets/app_drawer.dart'; + import 'package:mighty_plug_manager/bluetooth/devices/presets/presetsStorage.dart'; + import 'package:mighty_plug_manager/midi/MidiControllerManager.dart'; + import 'package:mighty_plug_manager/platform/simpleSharedPrefs.dart'; +-import 'package:sentry_flutter/sentry_flutter.dart'; + + import 'UI/pages/drumEditor.dart'; + import 'UI/pages/jamTracks.dart'; +@@ -32,7 +31,6 @@ import 'bluetooth/bleMidiHandler.dart'; + + //recreate this file with your own api keys + import 'bluetooth/devices/value_formatters/ValueFormatter.dart'; +-import 'configKeys.dart'; + + //able to create snackbars/messages everywhere + final navigatorKey = GlobalKey(); +@@ -43,55 +41,9 @@ void main() { + WidgetsFlutterBinding.ensureInitialized(); + SharedPrefs prefs = SharedPrefs(); + +- //capture flutter errors +- if (!kDebugMode) { +- FlutterError.onError = (FlutterErrorDetails details) { +- DebugConsole.print("Flutter error: ${details.toString()}"); +- +- //update diagnostics with json preset +- NuxDeviceControl.instance() +- .updateDiagnosticsData(includeJsonPreset: true); +- +- // Send report +- Sentry.captureException( +- details, +- stackTrace: details.stack, +- ); +- }; +- } +- +- if (!kDebugMode) { +- runZonedGuarded(() { +- prefs.waitLoading().then((value) async { +- if (!kDebugMode) { +- await SentryFlutter.init((options) { +- options.dsn = sentryDsn; +- }); +- } +- mainRunApp(); +- }); +- }, (Object error, StackTrace stackTrace) async { +- // Whenever an error occurs, call the `_reportError` function. This sends +- // Dart errors to the dev console or Sentry depending on the environment. +- //_reportError(error, stackTrace); +- +- DebugConsole.print("Dart error: ${error.toString()}"); +- DebugConsole.print(stackTrace); +- +- //update diagnostics with json preset +- NuxDeviceControl.instance() +- .updateDiagnosticsData(includeJsonPreset: true); +- +- await Sentry.captureException( +- error, +- stackTrace: stackTrace, +- ); +- }); +- } else { + prefs.waitLoading().then((value) { + mainRunApp(); + }); +- } + } + + mainRunApp() {