diff --git a/.metadata b/.metadata index 3c3e4b5..d1f7051 100644 --- a/.metadata +++ b/.metadata @@ -1,10 +1,30 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled and should not be manually edited. +# This file should be version controlled. version: - revision: 5464c5bac742001448fe4fc0597be939379f88ea - channel: stable + revision: 5293f3cd4427b4b48ed155e7a3852c6b3c53d94a + channel: beta project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 5293f3cd4427b4b48ed155e7a3852c6b3c53d94a + base_revision: 5293f3cd4427b4b48ed155e7a3852c6b3c53d94a + - platform: windows + create_revision: 5293f3cd4427b4b48ed155e7a3852c6b3c53d94a + base_revision: 5293f3cd4427b4b48ed155e7a3852c6b3c53d94a + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..fbbe542 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,8 @@ +{ + "ExpandedNodes": [ + "", + "\\windows" + ], + "SelectedNode": "\\windows", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/fipy/v17/.suo b/.vs/fipy/v17/.suo new file mode 100644 index 0000000..3bc86bd Binary files /dev/null and b/.vs/fipy/v17/.suo differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..f047cfb Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/README.md b/README.md index a192dbb..6f13af1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# fip_parser_ui +# fipy Explore FIP's webradio latest tracks, play it and download what you want. diff --git a/android/app/build.gradle b/android/app/build.gradle index 66ca2c4..7e1f926 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -43,7 +43,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.fip_parser_ui" + applicationId "fipy.p2p.legal" minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index d6a2dd1..f6cc746 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="fipy.p2p.legal"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 5fe8803..15b349e 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,9 +1,9 @@ + package="fipy.p2p.legal"> + android:icon="@mipmap/ic_launcher"> + package="fipy.p2p.legal"> diff --git a/assets/logo_aquamarine.jpg b/assets/logo_aquamarine.jpg new file mode 100644 index 0000000..bed2031 Binary files /dev/null and b/assets/logo_aquamarine.jpg differ diff --git a/assets/logo_green_dark.jpg b/assets/logo_green_dark.jpg new file mode 100644 index 0000000..9b6e39b Binary files /dev/null and b/assets/logo_green_dark.jpg differ diff --git a/assets/test.webm b/assets/test.webm new file mode 100644 index 0000000..e65bfce Binary files /dev/null and b/assets/test.webm differ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 76aa247..6339c47 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -294,7 +294,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.fipParserUi; + PRODUCT_BUNDLE_IDENTIFIER = fipy.p2p.legal; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -422,7 +422,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.fipParserUi; + PRODUCT_BUNDLE_IDENTIFIER = fipy.p2p.legal; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -444,7 +444,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.fipParserUi; + PRODUCT_BUNDLE_IDENTIFIER = fipy.p2p.legal; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -478,4 +478,4 @@ /* End XCConfigurationList section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; -} \ No newline at end of file +} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 5960b60..7a03e8f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 78734d9..a006de5 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index d47a699..067504d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 9459f7e..35b9c55 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 67e0962..ab88be5 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index 3633d7b..afbd528 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 4336459..5792e0c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index d47a699..067504d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index f5454ed..31c3e71 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index f7cea6c..0923e19 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png new file mode 100644 index 0000000..a28908c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png new file mode 100644 index 0000000..54d3158 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png new file mode 100644 index 0000000..db359ea Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png new file mode 100644 index 0000000..039daa4 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index f7cea6c..0923e19 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index 9388a13..d080f7a 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png new file mode 100644 index 0000000..540ed27 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png new file mode 100644 index 0000000..8beae93 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 5681e07..3b0f963 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index d3b7c13..9a497b5 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 9298fe2..0a44c30 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 5479826..1a2f04b 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - fip_parser_ui + fipy CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/main.dart b/lib/main.dart index 521038a..ca1adc6 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,13 +1,15 @@ -import 'package:fip_parser_ui/providers/home.dart'; -import 'package:fip_parser_ui/providers/player.dart'; -import 'package:fip_parser_ui/screens/home.dart'; +import 'package:fipy/providers/home.dart'; +import 'package:fipy/providers/player.dart'; +import 'package:fipy/screens/home.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:kplayer/kplayer.dart'; +// import 'package:kplayer_with_audioplayers/kplayer_with_audioplayers.dart' as kp; Future main() async { WidgetsFlutterBinding.ensureInitialized(); Player.boot(); + // kp.Player.boot(); runApp(const FipyApp()); } diff --git a/lib/providers/home.dart b/lib/providers/home.dart index 3bde3eb..466a8d5 100644 --- a/lib/providers/home.dart +++ b/lib/providers/home.dart @@ -1,17 +1,19 @@ // ignore_for_file: avoid_print import 'dart:convert'; -import 'package:fip_parser_ui/globals.dart'; +import 'package:ffmpeg_cli/ffmpeg_cli.dart'; +import 'package:fipy/globals.dart'; import 'package:flutter/foundation.dart'; import 'package:universal_io/io.dart'; -import 'package:fip_parser_ui/models/track.dart'; +import 'package:fipy/models/track.dart'; import 'package:flutter/material.dart'; import 'package:kplayer/kplayer.dart'; import 'package:path_provider/path_provider.dart'; import 'package:youtube_explode_dart/youtube_explode_dart.dart'; -import 'package:fip_parser_ui/providers/player.dart'; +import 'package:fipy/providers/player.dart'; import 'package:provider/provider.dart'; import 'package:http/http.dart'; +// import 'package:kplayer_with_audioplayers/kplayer_with_audioplayers.dart' as kp; class HomeProvider with ChangeNotifier { Track? currentTrack; @@ -84,16 +86,25 @@ class HomeProvider with ChangeNotifier { if (track.id == null) { final secondMatch = track.artiste == '' ? track.album : track.artiste; - final resultUrl = - await yt.search.search(track.title + ' ' + secondMatch!); + final resultUrl = await yt.search + .search(track.title + ' ' + secondMatch!, filter: TypeFilters.video); track.id = resultUrl.first.id.value; } - const invidiousUrl = - 'yewtu.be'; //yewtu.be vid.puffyan.us invidious.snopyta.org invidious.fdn.fr - + const invidiousUrl = [ + 'yewtu.be', + 'vid.puffyan.us', + 'invidious.snopyta.org', + 'invidious.fdn.fr', + ]; + // final media = PlayerMedia( + // type: PlayerMediaType.network, + // resource: + // "https://${invidiousUrl[0]}/latest_version?id=${track.id}&itag=140&local=true&listen=1"); + // player = kp.Player(media: media); player = Player.network( - "https://$invidiousUrl/embed/${track.id}?raw=1&listen=1"); - print(track.id); + "https://${invidiousUrl[0]}/latest_version?id=${track.id}&itag=140&local=true&listen=1"); // https://${invidiousUrl[0]}/embed/${track.id}?listen=1&raw=1&local=true + player!.init(); + print(player!.media.resource); player!.volume = currentVolume; @@ -151,6 +162,7 @@ class HomeProvider with ChangeNotifier { await fileStream.flush(); await fileStream.close(); yt.close(); + // convertToMp3(file.path); track.file = file; @@ -195,3 +207,28 @@ class DownloadProvider with ChangeNotifier { notifyListeners(); } } + +Future convertToMp3(String audioFile) async { + audioFile = 'E:\\Téléchargements/test.webm'; + final command = FfmpegCommand( + inputs: [FfmpegInput.asset(audioFile)], + args: [ + // CliArg(name: 'i', value: audioFile), + const CliArg(name: 'ab', value: '320'), + const CliArg(name: 'ar', value: '44100'), + ], + filterGraph: const FilterGraph( + chains: [ + FilterChain( + inputs: [], + filters: [], + outputs: [], + ), + ], + ), + outputFilepath: "E:\\Téléchargements/test.mp3", + ); + +// Execute command + await Ffmpeg().run(command); +} diff --git a/lib/screens/home.dart b/lib/screens/home.dart index 738da93..09f6e07 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -1,9 +1,9 @@ // ignore_for_file: prefer_const_literals_to_create_immutables, avoid_print import 'dart:convert'; -import 'package:fip_parser_ui/models/track.dart'; -import 'package:fip_parser_ui/providers/home.dart'; -import 'package:fip_parser_ui/providers/player.dart'; +import 'package:fipy/models/track.dart'; +import 'package:fipy/providers/home.dart'; +import 'package:fipy/providers/player.dart'; import 'package:flutter/material.dart'; import 'package:miniplayer/miniplayer.dart'; import 'package:provider/provider.dart'; @@ -31,7 +31,7 @@ class _HomeScreenState extends State { thumbColor: Colors.grey[600], radius: const Radius.circular(20), thickness: 12, - thumbVisibility: true, + // thumbVisibility: true, mainAxisMargin: 70, child: SingleChildScrollView( child: Column( diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 7241a6c..5643319 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) project(runner LANGUAGES CXX) set(BINARY_NAME "fipy") -set(APPLICATION_ID "com.example.fipy") +set(APPLICATION_ID "fipy.p2p.legal") cmake_policy(SET CMP0063 NEW) diff --git a/make_exe.iss b/make_exe.iss index 8802874..128a32b 100644 --- a/make_exe.iss +++ b/make_exe.iss @@ -5,7 +5,7 @@ #define MyAppVersion "0.1" #define MyAppPublisher "p2p.legal" #define MyAppURL "https://p2p.legal" -#define MyAppExeName "fip_parser_ui.exe" +#define MyAppExeName "fipy.exe" [Setup] ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. @@ -35,14 +35,14 @@ Name: "french"; MessagesFile: "compiler:Languages\French.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "C:\Users\poka\dev\fip_parser_ui\build\windows\runner\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\poka\dev\fip_parser_ui\build\windows\runner\Release\dart_vlc_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\poka\dev\fip_parser_ui\build\windows\runner\Release\flutter_windows.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\poka\dev\fip_parser_ui\build\windows\runner\Release\libvlc.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\poka\dev\fip_parser_ui\build\windows\runner\Release\libvlccore.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\poka\dev\fip_parser_ui\build\windows\runner\Release\url_launcher_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\poka\dev\fip_parser_ui\build\windows\runner\Release\data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "C:\Users\poka\dev\fip_parser_ui\build\windows\runner\Release\plugins\*"; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "C:\Users\poka\dev\fipy\build\windows\runner\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Users\poka\dev\fipy\build\windows\runner\Release\dart_vlc_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Users\poka\dev\fipy\build\windows\runner\Release\flutter_windows.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Users\poka\dev\fipy\build\windows\runner\Release\libvlc.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Users\poka\dev\fipy\build\windows\runner\Release\libvlccore.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Users\poka\dev\fipy\build\windows\runner\Release\url_launcher_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Users\poka\dev\fipy\build\windows\runner\Release\data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "C:\Users\poka\dev\fipy\build\windows\runner\Release\plugins\*"; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/pubspec.lock b/pubspec.lock index 65ae1b3..b8328e8 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -70,7 +70,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.15.0" crypto: dependency: transitive description: @@ -112,7 +112,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" ffi: dependency: transitive description: @@ -120,6 +120,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.2" + ffmpeg_cli: + dependency: "direct main" + description: + name: ffmpeg_cli + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.0" file: dependency: transitive description: @@ -132,13 +139,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_launcher_icons_maker: - dependency: "direct dev" - description: - name: flutter_launcher_icons_maker - url: "https://pub.dartlang.org" - source: hosted - version: "0.10.2" flutter_lints: dependency: "direct dev" description: @@ -184,6 +184,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "4.0.0" + icons_launcher: + dependency: "direct dev" + description: + name: icons_launcher + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.3" image: dependency: transitive description: @@ -197,7 +204,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.4" + version: "0.6.3" json_annotation: dependency: transitive description: @@ -232,28 +239,28 @@ packages: name: kplayer url: "https://pub.dartlang.org" source: hosted - version: "0.1.12" + version: "0.1.18" kplayer_platform_interface: dependency: transitive description: name: kplayer_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "0.0.7" + version: "0.0.12" kplayer_with_dart_vlc: dependency: transitive description: name: kplayer_with_dart_vlc url: "https://pub.dartlang.org" source: hosted - version: "0.0.8" + version: "0.0.10" kplayer_with_just_audio: dependency: transitive description: name: kplayer_with_just_audio url: "https://pub.dartlang.org" source: hosted - version: "0.0.8" + version: "0.0.10" lints: dependency: transitive description: @@ -261,6 +268,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.1" + logging: + dependency: transitive + description: + name: logging + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" matcher: dependency: transitive description: @@ -274,7 +288,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.3" meta: dependency: transitive description: @@ -304,7 +318,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" path_provider: dependency: "direct main" description: @@ -407,7 +421,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -442,7 +456,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" typed_data: dependency: transitive description: @@ -526,7 +540,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" win32: dependency: transitive description: @@ -563,5 +577,5 @@ packages: source: hosted version: "1.11.0" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.16.2 <3.0.0" flutter: ">=2.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index e512284..4e73cf4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: fip_parser_ui +name: fipy description: Advanced FIP radio track explorer publish_to: 'none' # Remove this line if you wish to publish to pub.dev @@ -17,7 +17,8 @@ dependencies: # ref: master url_launcher: ^6.1.0 http: ^0.13.4 - kplayer: ^0.1.12 + kplayer: ^0.1.18 + # kplayer_with_audioplayers: ^0.0.10 miniplayer: #^1.0.1 git: url: https://git.p2p.legal/poka/flutter_miniplayer.git @@ -25,27 +26,28 @@ dependencies: provider: ^6.0.1 path_provider: ^2.0.9 universal_io: ^2.0.4 + ffmpeg_cli: ^0.1.0 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^1.0.0 - flutter_launcher_icons_maker: ^0.10.2 + icons_launcher: ^1.1.3 flutter_icons: - android: "launcher_icon" + android: true ios: true - macos: true + # macos: true windows: true web: true - image_path: "assets/logo.jpg" + image_path: "assets/logo_aquamarine.jpg" flutter: uses-material-design: true # To add assets to your application, add an assets section, like this: assets: - - assets/logo.jpg + - assets/test.webm # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. diff --git a/test/widget_test.dart b/test/widget_test.dart index 353fd62..74f5233 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:fip_parser_ui/main.dart'; +import 'package:fipy/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { diff --git a/web/favicon.png b/web/favicon.png index 1d76d53..4164b8f 100644 Binary files a/web/favicon.png and b/web/favicon.png differ diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png index 6b65558..0f3b0e2 100644 Binary files a/web/icons/Icon-192.png and b/web/icons/Icon-192.png differ diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png index fd5fa85..cb4a61d 100644 Binary files a/web/icons/Icon-512.png and b/web/icons/Icon-512.png differ diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png index eb9b4d7..0f3b0e2 100644 Binary files a/web/icons/Icon-maskable-192.png and b/web/icons/Icon-maskable-192.png differ diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png index d69c566..cb4a61d 100644 Binary files a/web/icons/Icon-maskable-512.png and b/web/icons/Icon-maskable-512.png differ diff --git a/web/index.html b/web/index.html index 0e1d935..ef429a7 100644 --- a/web/index.html +++ b/web/index.html @@ -23,13 +23,13 @@ - + - fip_parser_ui + fipy diff --git a/web/manifest.json b/web/manifest.json index a1c7c33..6b678a1 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -1,6 +1,6 @@ { - "name": "fip_parser_ui", - "short_name": "fip_parser_ui", + "name": "fipy", + "short_name": "fipy", "start_url": ".", "display": "standalone", "background_color": "#0175C2", diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index efa0e67..ecb052b 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.14) -project(fip_parser_ui LANGUAGES CXX) +project(fipy LANGUAGES CXX) -set(BINARY_NAME "fip_parser_ui") +set(BINARY_NAME "fipy") cmake_policy(SET CMP0063 NEW) diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 6a28a60..523e4c3 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -7,9 +7,6 @@ list(APPEND FLUTTER_PLUGIN_LIST url_launcher_windows ) -list(APPEND FLUTTER_FFI_PLUGIN_LIST -) - set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -18,8 +15,3 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) - -foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) -endforeach(ffi_plugin) diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index 2025f68..1ce7fe6 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -89,13 +89,13 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "com.example" "\0" - VALUE "FileDescription", "fip_parser_ui" "\0" + VALUE "CompanyName", "fipy.p2p" "\0" + VALUE "FileDescription", "fipy" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "fip_parser_ui" "\0" - VALUE "LegalCopyright", "Copyright (C) 2022 com.example. All rights reserved." "\0" - VALUE "OriginalFilename", "fip_parser_ui.exe" "\0" - VALUE "ProductName", "fip_parser_ui" "\0" + VALUE "InternalName", "fipy" "\0" + VALUE "LegalCopyright", "Copyright (C) 2022 fipy.p2p. All rights reserved." "\0" + VALUE "OriginalFilename", "fipy.exe" "\0" + VALUE "ProductName", "fipy" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp index 3e805d5..e67b039 100644 --- a/windows/runner/main.cpp +++ b/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.CreateAndShow(L"fip_parser_ui", origin, size)) { + if (!window.CreateAndShow(L"fipy", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true); diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico index 43792db..e8698fa 100644 Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ diff --git a/windows/runner/resources/app_icon_1024.ico b/windows/runner/resources/app_icon_1024.ico deleted file mode 100644 index c562250..0000000 Binary files a/windows/runner/resources/app_icon_1024.ico and /dev/null differ diff --git a/windows/runner/resources/app_icon_128.ico b/windows/runner/resources/app_icon_128.ico deleted file mode 100644 index 5e1e275..0000000 Binary files a/windows/runner/resources/app_icon_128.ico and /dev/null differ diff --git a/windows/runner/resources/app_icon_256.ico b/windows/runner/resources/app_icon_256.ico deleted file mode 100644 index c562250..0000000 Binary files a/windows/runner/resources/app_icon_256.ico and /dev/null differ diff --git a/windows/runner/resources/app_icon_32.ico b/windows/runner/resources/app_icon_32.ico deleted file mode 100644 index 43792db..0000000 Binary files a/windows/runner/resources/app_icon_32.ico and /dev/null differ diff --git a/windows/runner/resources/app_icon_512.ico b/windows/runner/resources/app_icon_512.ico deleted file mode 100644 index c562250..0000000 Binary files a/windows/runner/resources/app_icon_512.ico and /dev/null differ diff --git a/windows/runner/resources/app_icon_64.ico b/windows/runner/resources/app_icon_64.ico deleted file mode 100644 index 575c8ce..0000000 Binary files a/windows/runner/resources/app_icon_64.ico and /dev/null differ