diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 087e58b..7a68577 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,17 +43,17 @@ jobs: run: jarsigner --verify --verbose build/app/outputs/flutter-apk/app-release.apk - name: Rename APK file - run: mv build/app/outputs/flutter-apk/app-release.apk build/app/outputs/flutter-apk/bloomee_tunes_v2.7.13+${{github.run_number}}.apk + run: mv build/app/outputs/flutter-apk/app-release.apk build/app/outputs/flutter-apk/bloomee_tunes_v2.7.14+${{github.run_number}}.apk - name: Upload Artifacts uses: actions/upload-artifact@v2 with: name: Release path: | - build/app/outputs/flutter-apk/bloomee_tunes_v2.7.13+${{github.run_number}}.apk + build/app/outputs/flutter-apk/bloomee_tunes_v2.7.14+${{github.run_number}}.apk - name: Create Release uses: ncipollo/release-action@v1 with: - artifacts: "build/app/outputs/flutter-apk/bloomee_tunes_v2.7.13+${{github.run_number}}.apk" - tag: v2.7.13+${{github.run_number}} + artifacts: "build/app/outputs/flutter-apk/bloomee_tunes_v2.7.14+${{github.run_number}}.apk" + tag: v2.7.14+${{github.run_number}} token: ${{secrets.SECRET_KEY}} \ No newline at end of file diff --git a/lib/repository/Youtube/yt_music_api.dart b/lib/repository/Youtube/yt_music_api.dart index a99c954..f8df45b 100644 --- a/lib/repository/Youtube/yt_music_api.dart +++ b/lib/repository/Youtube/yt_music_api.dart @@ -682,8 +682,16 @@ class YtMusicService { 'text' ]) as String?; final String subtitle = (nav(response, [ - 'header', - 'musicDetailHeaderRenderer', + 'contents', + 'twoColumnBrowseResultsRenderer', + 'tabs', + 0, + 'tabRenderer', + 'content', + "sectionListRenderer", + 'contents', + 0, + 'musicResponsiveHeaderRenderer', 'subtitle', 'runs', ]) as List? ?? @@ -692,30 +700,47 @@ class YtMusicService { .toList() .join(); final String? description = nav(response, [ - 'header', - 'musicDetailHeaderRenderer', + 'contents', + 'twoColumnBrowseResultsRenderer', + 'tabs', + 0, + 'tabRenderer', + 'content', + "sectionListRenderer", + 'contents', + 0, + 'musicResponsiveHeaderRenderer', + 'description', + 'musicDescriptionShelfRenderer', 'description', 'runs', 0, 'text' ]) as String?; + final List images = (nav(response, [ - 'header', - 'musicDetailHeaderRenderer', + 'contents', + 'twoColumnBrowseResultsRenderer', + 'tabs', + 0, + 'tabRenderer', + 'content', + "sectionListRenderer", + 'contents', + 0, + 'musicResponsiveHeaderRenderer', 'thumbnail', - 'croppedSquareThumbnailRenderer', + 'musicThumbnailRenderer', 'thumbnail', 'thumbnails' ]) as List) .map((e) => e['url']) .toList(); + final List finalResults = nav(response, [ 'contents', - 'singleColumnBrowseResultsRenderer', - 'tabs', - 0, - 'tabRenderer', - 'content', + 'twoColumnBrowseResultsRenderer', + 'secondaryContents', 'sectionListRenderer', 'contents', 0, diff --git a/lib/screens/screen/audioPlayer_screen.dart b/lib/screens/screen/audioPlayer_screen.dart index 8f2e109..7353562 100644 --- a/lib/screens/screen/audioPlayer_screen.dart +++ b/lib/screens/screen/audioPlayer_screen.dart @@ -1,3 +1,4 @@ +import 'dart:developer'; import 'dart:ui'; import 'package:Bloomee/model/songModel.dart'; import 'package:Bloomee/screens/screen/home_views/timer_view.dart'; @@ -373,6 +374,8 @@ class _AudioPlayerViewState extends State { .watch() .progressStreams, builder: (context, snapshot) { + log((snapshot.data?.currentPos).toString(), + name: "Duration"); return ProgressBar( progress: snapshot.data?.currentPos ?? Duration.zero, @@ -755,6 +758,11 @@ class _AudioPlayerViewState extends State { ), ); } + + Widget desktopViewPlayer( + BuildContext context, BloomeeMusicPlayer musicPlayer) { + return Text("Desktop View"); + } } Widget _getAmbientShadowWidget( diff --git a/lib/screens/screen/home_views/youtube_views/playlist.dart b/lib/screens/screen/home_views/youtube_views/playlist.dart index fa9de58..5429cba 100644 --- a/lib/screens/screen/home_views/youtube_views/playlist.dart +++ b/lib/screens/screen/home_views/youtube_views/playlist.dart @@ -51,6 +51,7 @@ class _YoutubePlaylistState extends State { Future _loadData() async { final res = await data; + // log(res.toString(), name: "YoutubePlaylist"); items = res["songs"] as List>; mediaitems = fromYtSongMapList2MediaItemList(items); // for (var i = 0; i < items.length; i++) { diff --git a/pubspec.yaml b/pubspec.yaml index 2c3212b..feb1f29 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 2.7.13+0 +version: 2.7.14+0 environment: sdk: '>=3.0.6 <4.0.0' @@ -40,8 +40,8 @@ dependencies: carousel_slider: ^4.2.1 palette_generator: ^0.3.3+2 audio_video_progress_bar: ^1.0.1 - just_audio: ^0.9.37 - just_audio_windows: ^0.2.0 + just_audio: ^0.9.38 + just_audio_windows: ^0.2.1 audio_service: ^0.18.13 audio_session: ^0.1.16 rxdart: ^0.27.7 diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt index 930d207..903f489 100644 --- a/windows/flutter/CMakeLists.txt +++ b/windows/flutter/CMakeLists.txt @@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake) # https://github.com/flutter/flutter/issues/57146. set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + # === Flutter Library === set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") @@ -92,7 +97,7 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E env ${FLUTTER_TOOL_ENVIRONMENT} "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - windows-x64 $ + ${FLUTTER_TARGET_PLATFORM} $ VERBATIM ) add_custom_target(flutter_assemble DEPENDS