diff --git a/lib/screens/screen/add_to_playlist_screen.dart b/lib/screens/screen/add_to_playlist_screen.dart index 094a2e5..3df7a60 100644 --- a/lib/screens/screen/add_to_playlist_screen.dart +++ b/lib/screens/screen/add_to_playlist_screen.dart @@ -1,6 +1,4 @@ -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; import 'package:Bloomee/blocs/add_to_playlist/cubit/add_to_playlist_cubit.dart'; @@ -12,6 +10,7 @@ import 'package:Bloomee/services/db/cubit/mediadb_cubit.dart'; import 'package:Bloomee/theme_data/default.dart'; import 'package:Bloomee/routes_and_consts/global_conts.dart'; import 'package:Bloomee/utils/load_Image.dart'; +import 'package:icons_plus/icons_plus.dart'; class AddToPlaylistScreen extends StatefulWidget { AddToPlaylistScreen({super.key}); @@ -210,7 +209,7 @@ class _AddToPlaylistScreenState extends State { ), floatingActionButton: FloatingActionButton.extended( icon: const Icon( - FluentIcons.add_48_filled, + MingCute.add_fill, size: 25, color: Default_Theme.primaryColor1, ), diff --git a/lib/screens/screen/audioPlayer_screen.dart b/lib/screens/screen/audioPlayer_screen.dart index ffe8ad6..e8c7eb1 100644 --- a/lib/screens/screen/audioPlayer_screen.dart +++ b/lib/screens/screen/audioPlayer_screen.dart @@ -1,9 +1,9 @@ import 'package:Bloomee/services/bloomeePlayer.dart'; import 'package:audio_service/audio_service.dart'; import 'package:audio_video_progress_bar/audio_video_progress_bar.dart'; -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:icons_plus/icons_plus.dart'; import 'package:just_audio/just_audio.dart'; import 'package:Bloomee/screens/widgets/like_widget.dart'; import 'package:Bloomee/screens/widgets/playPause_widget.dart'; @@ -12,10 +12,8 @@ import 'package:Bloomee/theme_data/default.dart'; import 'package:Bloomee/utils/load_Image.dart'; import 'package:Bloomee/utils/pallete_generator.dart'; import 'package:url_launcher/url_launcher_string.dart'; - import '../../blocs/mediaPlayer/bloomee_player_cubit.dart'; import '../widgets/mediaItemOptions_bottomsheet.dart'; -import '../widgets/unicode_icons.dart'; class AudioPlayerView extends StatefulWidget { const AudioPlayerView({super.key}); @@ -47,9 +45,8 @@ class _AudioPlayerViewState extends State { .bloomeePlayer .currentMedia); }, - icon: UnicodeIcon( - strCode: "\uf142", - fontColor: Default_Theme.primaryColor2.withOpacity(1))) + icon: const Icon(MingCute.more_2_fill, + size: 25, color: Default_Theme.primaryColor1)) ], title: Column( children: [ @@ -290,17 +287,17 @@ class _AudioPlayerViewState extends State { InkWell( onTap: () => musicPlayer.rewind(), child: const Icon( - FluentIcons.replay_20_regular, + MingCute.refresh_4_line, color: Default_Theme.primaryColor1, - size: 35, + size: 40, ), ), InkWell( onTap: () => musicPlayer.skipToPrevious(), child: const Icon( - FluentIcons.previous_48_filled, + MingCute.skip_previous_fill, color: Default_Theme.primaryColor1, - size: 35, + size: 40, ), ), StreamBuilder( @@ -354,16 +351,16 @@ class _AudioPlayerViewState extends State { InkWell( onTap: () => musicPlayer.skipToNext(), child: const Icon( - FluentIcons.next_48_filled, + MingCute.skip_forward_fill, color: Default_Theme.primaryColor1, - size: 35, + size: 40, ), ), InkWell( child: const Icon( - FluentIcons.open_48_filled, + MingCute.external_link_line, color: Default_Theme.primaryColor1, - size: 35, + size: 40, ), onTap: () { launchUrlString(context diff --git a/lib/screens/screen/explore_screen.dart b/lib/screens/screen/explore_screen.dart index 79f258b..b3844da 100644 --- a/lib/screens/screen/explore_screen.dart +++ b/lib/screens/screen/explore_screen.dart @@ -3,9 +3,9 @@ import 'package:Bloomee/screens/screen/home_views/notification_view.dart'; import 'package:Bloomee/screens/screen/home_views/setting_view.dart'; import 'package:Bloomee/screens/screen/home_views/timer_view.dart'; import 'package:Bloomee/theme_data/default.dart'; +import 'package:icons_plus/icons_plus.dart'; import '../widgets/carousal_widget.dart'; import '../widgets/tabList_widget.dart'; -import '../widgets/unicode_icons.dart'; class ExploreScreen extends StatelessWidget { const ExploreScreen({super.key}); @@ -44,49 +44,42 @@ class ExploreScreen extends StatelessWidget { style: Default_Theme.primaryTextStyle.merge(const TextStyle( fontSize: 34, color: Default_Theme.primaryColor1))), const Spacer(), - InkWell( - splashColor: Colors.transparent, - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => const NotificationView())); - }, - child: const UnicodeIcon( - strCode: "\uf0f3", - font: Default_Theme.fontAwesomeRegularFont, - fontSize: 25.0, - padding: EdgeInsets.only(left: 15), + Padding( + padding: const EdgeInsets.only(right: 10), + child: InkWell( + splashColor: Colors.transparent, + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => const NotificationView())); + }, + child: const Icon(MingCute.notification_line, + color: Default_Theme.primaryColor1, size: 30.0), ), ), - InkWell( - splashColor: Colors.transparent, - onTap: () { - Navigator.push(context, - MaterialPageRoute(builder: (context) => const TimerView())); - }, - child: const UnicodeIcon( - strCode: "\uf1da", - font: Default_Theme.fontAwesomeSolidFont, - fontSize: 24.0, - padding: EdgeInsets.only(left: 15), + Padding( + padding: const EdgeInsets.only(right: 10), + child: InkWell( + splashColor: Colors.transparent, + onTap: () { + Navigator.push(context, + MaterialPageRoute(builder: (context) => const TimerView())); + }, + child: const Icon(MingCute.stopwatch_line, + color: Default_Theme.primaryColor1, size: 30.0), ), ), InkWell( - splashColor: Colors.transparent, - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => const SettingsView())); - }, - child: const UnicodeIcon( - strCode: "\uf013", - font: Default_Theme.fontAwesomeSolidFont, - fontSize: 25.0, - padding: EdgeInsets.only(left: 15, right: 5), - ), - ), + splashColor: Colors.transparent, + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => const SettingsView())); + }, + child: const Icon(MingCute.settings_3_line, + color: Default_Theme.primaryColor1, size: 30.0)), ], ), ); diff --git a/lib/screens/screen/library_screen.dart b/lib/screens/screen/library_screen.dart index fe4be81..88bd0ac 100644 --- a/lib/screens/screen/library_screen.dart +++ b/lib/screens/screen/library_screen.dart @@ -1,4 +1,3 @@ -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; @@ -7,9 +6,8 @@ import 'package:Bloomee/routes_and_consts/global_str_consts.dart'; import 'package:Bloomee/screens/widgets/createPlaylist_bottomsheet.dart'; import 'package:Bloomee/screens/widgets/smallPlaylistCard_widget.dart'; import 'package:Bloomee/services/db/MediaDB.dart'; - import 'package:Bloomee/theme_data/default.dart'; -import '../widgets/unicode_icons.dart'; +import 'package:icons_plus/icons_plus.dart'; class LibraryScreen extends StatelessWidget { const LibraryScreen({super.key}); @@ -82,22 +80,17 @@ class LibraryScreen extends StatelessWidget { onTap: () { createPlaylistBottomSheet(context); }, - child: const UnicodeIcon( - strCode: "\u002b", - font: Default_Theme.fontAwesomeSolidFont, - fontSize: 25.0, - padding: EdgeInsets.only(left: 7, right: 7), - ), + child: const Icon(MingCute.add_fill, + size: 25, color: Default_Theme.primaryColor1), ), InkWell( onTap: () { context.pushNamed(GlobalStrConsts.ImportMediaFromPlatforms); }, - child: const UnicodeIcon( - strCode: "\uf56f", - font: Default_Theme.fontAwesomeSolidFont, - fontSize: 25.0, - padding: EdgeInsets.only(left: 7, right: 5), + child: const Padding( + padding: EdgeInsets.only(left: 10), + child: Icon(FontAwesome.file_import_solid, + size: 25, color: Default_Theme.primaryColor1), ), ), ], @@ -133,7 +126,7 @@ class _ListOfPlaylistsState extends State { Padding( padding: EdgeInsets.only(left: 20), child: Icon( - FluentIcons.delete_dismiss_28_regular, + MingCute.delete_3_line, color: Colors.white, size: 30, ), diff --git a/lib/screens/screen/library_views/import_media_view.dart b/lib/screens/screen/library_views/import_media_view.dart index 002683b..f94653c 100644 --- a/lib/screens/screen/library_views/import_media_view.dart +++ b/lib/screens/screen/library_views/import_media_view.dart @@ -3,13 +3,13 @@ import 'dart:developer'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; +import 'package:icons_plus/icons_plus.dart'; import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; import 'package:Bloomee/repository/Saavn/cubit/saavn_repository_cubit.dart'; import 'package:Bloomee/screens/screen/library_views/cubit/import_playlist_cubit.dart'; import 'package:Bloomee/screens/widgets/import_playlist.dart'; import 'package:Bloomee/services/db/cubit/mediadb_cubit.dart'; import 'package:Bloomee/theme_data/default.dart'; -import '../../widgets/unicode_icons.dart'; class ImportMediaFromPlatformsView extends StatelessWidget { const ImportMediaFromPlatformsView({super.key}); @@ -36,27 +36,27 @@ class ImportMediaFromPlatformsView extends StatelessWidget { children: [ ImportFromBtn( btnName: "Playlist from Spotify", - btnIcon: "\uf1bc", + btnIcon: FontAwesome.spotify_brand, onClickFunc: () { getIdAndShowBottomSheet(context); }, ), ImportFromBtn( btnName: "Music from Spotify", - btnIcon: "\uf1bc", + btnIcon: FontAwesome.spotify_brand, onClickFunc: () { log("music from spotify"); }), ImportFromBtn( btnName: "Playlist from Youtube", - btnIcon: "\uf167", + btnIcon: FontAwesome.youtube_brand, onClickFunc: () { getIdAndShowBottomSheet(context, hintText: "Youtube Playlist ID", isSpotify: false); }), ImportFromBtn( btnName: "Music from Youtube", - btnIcon: "\uf167", + btnIcon: FontAwesome.youtube_brand, onClickFunc: () { log("music from youtube"); }), @@ -68,7 +68,7 @@ class ImportMediaFromPlatformsView extends StatelessWidget { class ImportFromBtn extends StatelessWidget { final String btnName; - final String btnIcon; + final IconData btnIcon; final VoidCallback onClickFunc; const ImportFromBtn({ Key? key, @@ -83,11 +83,9 @@ class ImportFromBtn extends StatelessWidget { onPressed: () { onClickFunc(); }, - icon: UnicodeIcon( - strCode: btnIcon, - font: const TextStyle(fontFamily: "FontAwesome-Brands"), - fontSize: 25.0, - padding: const EdgeInsets.only(left: 7, right: 5), + icon: Padding( + padding: const EdgeInsets.only(left: 8, right: 8), + child: Icon(btnIcon, color: Default_Theme.primaryColor1, size: 30), ), label: Text( btnName, diff --git a/lib/screens/screen/library_views/playlist_screen.dart b/lib/screens/screen/library_views/playlist_screen.dart index ffdb11c..c0c615f 100644 --- a/lib/screens/screen/library_views/playlist_screen.dart +++ b/lib/screens/screen/library_views/playlist_screen.dart @@ -1,6 +1,6 @@ -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:icons_plus/icons_plus.dart'; import 'package:just_audio/just_audio.dart'; import 'package:Bloomee/model/songModel.dart'; import 'package:Bloomee/screens/screen/library_views/cubit/current_playlist_cubit.dart'; @@ -252,7 +252,7 @@ class _PlaylistState extends State { Padding( padding: EdgeInsets.only(left: 20), child: Icon( - FluentIcons.delete_dismiss_28_regular, + MingCute.delete_3_line, color: Colors.white, size: 30, )), @@ -268,7 +268,7 @@ class _PlaylistState extends State { // Padding( // padding: EdgeInsets.only(right: 20), // child: Icon( - // FluentIcons.delete_dismiss_28_regular, + // MingCute.delete_3_line, // color: Colors.white, // size: 30, // ), diff --git a/lib/screens/screen/offline_screen.dart b/lib/screens/screen/offline_screen.dart index fb9c70a..f1fb50a 100644 --- a/lib/screens/screen/offline_screen.dart +++ b/lib/screens/screen/offline_screen.dart @@ -1,12 +1,7 @@ -// ignore_for_file: public_member_api_docs, sort_constructors_first -// import 'package:feather_icons/feather_icons.dart'; -// import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; import 'package:Bloomee/screens/screen/offline_views/downloads_status.dart'; - import 'package:Bloomee/theme_data/default.dart'; -// import 'package:unicons/unicons.dart'; -import '../widgets/unicode_icons.dart'; +import 'package:icons_plus/icons_plus.dart'; class OfflineScreen extends StatelessWidget { const OfflineScreen({super.key}); @@ -18,8 +13,8 @@ class OfflineScreen extends StatelessWidget { customDiscoverBar(context), //AppBar SliverList( delegate: SliverChildListDelegate([ - Text( - "data", + const Text( + "Coming Soon...", style: TextStyle(fontSize: 600), ) ])) @@ -41,22 +36,16 @@ class OfflineScreen extends StatelessWidget { style: Default_Theme.primaryTextStyle.merge(const TextStyle( fontSize: 34, color: Default_Theme.primaryColor1))), const Spacer(), - const UnicodeIcon( - strCode: "\uf002", - font: Default_Theme.fontAwesomeSolidFont, - fontSize: 24.0, - padding: EdgeInsets.only(left: 15), - ), InkWell( onTap: () { - Navigator.push(context, - MaterialPageRoute(builder: (context) => DownloadsView())); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => const DownloadsView())); }, - child: const UnicodeIcon( - strCode: "\uf019", - font: Default_Theme.fontAwesomeSolidFont, - fontSize: 25.0, - padding: EdgeInsets.only(left: 15, right: 5), + child: const Icon( + FontAwesome.download_solid, + size: 25, ), ), ], diff --git a/lib/screens/screen/offline_views/downloads_status.dart b/lib/screens/screen/offline_views/downloads_status.dart index 7e9f2ba..2edb5bd 100644 --- a/lib/screens/screen/offline_views/downloads_status.dart +++ b/lib/screens/screen/offline_views/downloads_status.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:Bloomee/theme_data/default.dart'; diff --git a/lib/screens/screen/search_screen.dart b/lib/screens/screen/search_screen.dart index 65d91e9..d5fe99b 100644 --- a/lib/screens/screen/search_screen.dart +++ b/lib/screens/screen/search_screen.dart @@ -1,13 +1,12 @@ // ignore_for_file: public_member_api_docs, sort_constructors_first import 'dart:developer'; - import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; - import 'package:Bloomee/repository/cubits/fetch_search_results.dart'; import 'package:Bloomee/screens/screen/search_views/search_page.dart'; import 'package:Bloomee/screens/widgets/horizontalSongCard_widget.dart'; import 'package:Bloomee/theme_data/default.dart'; +import 'package:icons_plus/icons_plus.dart'; class SearchScreen extends StatefulWidget { String searchQuery = ""; @@ -136,7 +135,7 @@ class _SearchScreenState extends State { decoration: InputDecoration( filled: true, suffixIcon: Icon( - Icons.search, + MingCute.search_2_fill, color: Default_Theme.primaryColor1.withOpacity(0.4), ), fillColor: Default_Theme.primaryColor2.withOpacity(0.07), @@ -185,12 +184,31 @@ class _SearchScreenState extends State { ); } else { return Center( - child: Text( - "No results found!\nTry another keyword or source engine!", - textAlign: TextAlign.center, - style: Default_Theme.tertiaryTextStyle.merge(TextStyle( - color: Default_Theme.primaryColor2.withOpacity(0.7), - fontSize: 14)), + child: Wrap( + children: [ + Column( + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: Icon( + MingCute.sweats_line, + color: + Default_Theme.primaryColor2.withOpacity(0.7), + size: 40, + ), + ), + Text( + "No results found!\nTry another keyword or source engine!", + textAlign: TextAlign.center, + style: Default_Theme.tertiaryTextStyle.merge( + TextStyle( + color: Default_Theme.primaryColor2 + .withOpacity(0.7), + fontSize: 14)), + ), + ], + ) + ], ), ); } diff --git a/lib/screens/screen/search_views/search_page.dart b/lib/screens/screen/search_views/search_page.dart index c196d9d..177fcf0 100644 --- a/lib/screens/screen/search_views/search_page.dart +++ b/lib/screens/screen/search_views/search_page.dart @@ -1,10 +1,10 @@ // ignore_for_file: public_member_api_docs, sort_constructors_first import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; - import 'package:Bloomee/repository/Youtube/youtube_api.dart'; import 'package:Bloomee/repository/cubits/fetch_search_results.dart'; import 'package:Bloomee/theme_data/default.dart'; +import 'package:icons_plus/icons_plus.dart'; class searchPageDelegate extends SearchDelegate { List searchList = []; @@ -58,14 +58,14 @@ class searchPageDelegate extends SearchDelegate { onPressed: () { query = ''; }, - icon: const Icon(Icons.clear)) + icon: const Icon(MingCute.close_fill)) ]; } @override Widget? buildLeading(BuildContext context) { return IconButton( - icon: const Icon(Icons.arrow_back), + icon: const Icon(MingCute.arrow_left_fill), onPressed: () => Navigator.of(context).pop(), // Exit from the search screen. ); diff --git a/lib/screens/widgets/carousal_widget.dart b/lib/screens/widgets/carousal_widget.dart index 0742c5e..f71c8f6 100644 --- a/lib/screens/widgets/carousal_widget.dart +++ b/lib/screens/widgets/carousal_widget.dart @@ -4,8 +4,8 @@ import 'package:carousel_slider/carousel_slider.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:Bloomee/routes_and_consts/global_str_consts.dart'; -import 'package:Bloomee/screens/widgets/unicode_icons.dart'; import 'package:Bloomee/theme_data/default.dart'; +import 'package:icons_plus/icons_plus.dart'; class CaraouselWidget extends StatefulWidget { CaraouselWidget({ @@ -43,7 +43,10 @@ class _CaraouselWidgetState extends State { fontWeight: FontWeight.bold, fontSize: 19)), ), - const UnicodeIcon(strCode: "\uf0e7"), + const Icon( + FontAwesome.bolt_lightning_solid, + color: Default_Theme.primaryColor1, + ), ], ), ), diff --git a/lib/screens/widgets/global_navbar.dart b/lib/screens/widgets/global_navbar.dart index 1a9a6c9..18f0395 100644 --- a/lib/screens/widgets/global_navbar.dart +++ b/lib/screens/widgets/global_navbar.dart @@ -1,8 +1,8 @@ -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; import 'package:google_nav_bar/google_nav_bar.dart'; +import 'package:icons_plus/icons_plus.dart'; import 'package:just_audio/just_audio.dart'; import 'package:Bloomee/routes_and_consts/global_str_consts.dart'; import 'package:Bloomee/screens/widgets/mini_player_widget.dart'; @@ -76,25 +76,25 @@ class ScaffholdWithNavbar extends StatelessWidget { backgroundColor: Default_Theme.themeColor.withOpacity(0.3), tabs: const [ // GButton( - // icon: FluentIcons.bin_full_20_filled, + // icon: MingCute.home_4_fill, // iconSize: 27, // text: "Test", // ), GButton( - icon: FluentIcons.home_heart_24_filled, + icon: MingCute.home_4_fill, iconSize: 27, text: "Home", ), GButton( - icon: FluentIcons.book_add_24_filled, + icon: MingCute.book_5_fill, text: "Library", ), GButton( - icon: FluentIcons.search_24_filled, + icon: MingCute.search_2_fill, text: "Search", ), GButton( - icon: FluentIcons.arrow_download_24_filled, + icon: MingCute.folder_download_fill, text: "Offline", ), ], diff --git a/lib/screens/widgets/horizontalSongCard_widget.dart b/lib/screens/widgets/horizontalSongCard_widget.dart index 05e43ce..6f010fe 100644 --- a/lib/screens/widgets/horizontalSongCard_widget.dart +++ b/lib/screens/widgets/horizontalSongCard_widget.dart @@ -6,10 +6,10 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; import 'package:Bloomee/model/MediaPlaylistModel.dart'; import 'package:Bloomee/screens/widgets/like_widget.dart'; -import 'package:Bloomee/screens/widgets/unicode_icons.dart'; import 'package:Bloomee/services/db/cubit/mediadb_cubit.dart'; import 'package:Bloomee/theme_data/default.dart'; import 'package:Bloomee/utils/load_Image.dart'; +import 'package:icons_plus/icons_plus.dart'; import '../../blocs/mediaPlayer/bloomee_player_cubit.dart'; import 'mediaItemOptions_bottomsheet.dart'; @@ -38,10 +38,10 @@ class HorizontalSongCardWidget extends StatelessWidget { @override Widget build(BuildContext context) { return InkWell( - splashColor: Default_Theme.accentColor2.withOpacity(0.5), + splashColor: Default_Theme.accentColor2.withOpacity(0.1), // focusColor: Default_Theme.accentColor2, - hoverColor: Default_Theme.accentColor2.withOpacity(0.2), - highlightColor: Default_Theme.accentColor2.withOpacity(0.3), + hoverColor: Default_Theme.accentColor2.withOpacity(0.1), + highlightColor: Default_Theme.accentColor2.withOpacity(0.1), onLongPress: () { if (mediaPlaylist != null) { showMediaItemOptions(context, mediaPlaylist!.mediaItems[index]); @@ -227,7 +227,8 @@ class HorizontalSongCardWidget extends StatelessWidget { return Visibility( visible: false, child: Padding( - padding: const EdgeInsets.only(left: 8.0, bottom: 3), + padding: const EdgeInsets.only( + left: 8.0, bottom: 3, right: 5.0), child: LikeBtnWidget( isLiked: isLiked, iconSize: 29, @@ -241,10 +242,8 @@ class HorizontalSongCardWidget extends StatelessWidget { ), Visibility( visible: showOptions, - child: UnicodeIcon( - strCode: "\uf142", - fontColor: Default_Theme.primaryColor2.withOpacity(0.7), - )), + child: const Icon(MingCute.more_2_fill, + color: Default_Theme.accentColor2, size: 30.0)), ], ) ], diff --git a/lib/screens/widgets/like_widget.dart b/lib/screens/widgets/like_widget.dart index 6e5e753..0b768de 100644 --- a/lib/screens/widgets/like_widget.dart +++ b/lib/screens/widgets/like_widget.dart @@ -1,7 +1,7 @@ -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; +import 'dart:developer'; import 'package:flutter/material.dart'; - import 'package:Bloomee/theme_data/default.dart'; +import 'package:icons_plus/icons_plus.dart'; // ignore: must_be_immutable class LikeBtnWidget extends StatefulWidget { @@ -33,10 +33,10 @@ class _LikeBtnWidgetState extends State { widget.isLiked = !widget.isLiked; if (widget.isLiked) { widget.onLiked!(); - print("Liked"); + log("Liked"); } else { widget.onDisliked!(); - print("DisLiked"); + log("DisLiked"); } }); }, @@ -56,12 +56,12 @@ Icon heartIcon( {isliked = false, color = Default_Theme.accentColor2, size = 50}) { return isliked ? Icon( - FluentIcons.heart_48_filled, + AntDesign.heart_fill, color: color, size: size, ) : Icon( - FluentIcons.heart_48_regular, + AntDesign.heart_outline, color: color, size: size, ); diff --git a/lib/screens/widgets/mediaItemOptions_bottomsheet.dart b/lib/screens/widgets/mediaItemOptions_bottomsheet.dart index 43f7f29..2e971fc 100644 --- a/lib/screens/widgets/mediaItemOptions_bottomsheet.dart +++ b/lib/screens/widgets/mediaItemOptions_bottomsheet.dart @@ -1,8 +1,8 @@ // ignore_for_file: public_member_api_docs, sort_constructors_first -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; +import 'package:icons_plus/icons_plus.dart'; import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; import 'package:Bloomee/blocs/add_to_playlist/cubit/add_to_playlist_cubit.dart'; @@ -109,16 +109,16 @@ void showMediaItemOptions(BuildContext context, MediaItemModel mediaItemModel) { }, child: const OptionIconBtn( btnName: "Add to Playlist", - btnIconData: FluentIcons.library_24_filled, + btnIconData: MingCute.album_2_fill, ), ), const OptionIconBtn( btnName: "Save Offline", - btnIconData: FluentIcons.arrow_download_48_filled), + btnIconData: MingCute.download_2_fill), InkWell( child: const OptionIconBtn( btnName: "Share with others", - btnIconData: FluentIcons.share_48_filled, + btnIconData: MingCute.share_2_line, ), onTap: () { Share.share( @@ -129,7 +129,7 @@ void showMediaItemOptions(BuildContext context, MediaItemModel mediaItemModel) { InkWell( child: const OptionIconBtn( btnName: "Open in Browser", - btnIconData: Icons.open_in_browser_outlined, + btnIconData: MingCute.chrome_fill, ), onTap: () { launchUrl(Uri.parse(mediaItemModel.extras?['perma_url'])); @@ -164,7 +164,7 @@ class OptionIconBtn extends StatelessWidget { children: [ Icon( btnIconData, - size: 35, + size: 30, color: Default_Theme.primaryColor1, ), Padding( diff --git a/lib/screens/widgets/mini_player_widget.dart b/lib/screens/widgets/mini_player_widget.dart index ed32ec9..2e6809b 100644 --- a/lib/screens/widgets/mini_player_widget.dart +++ b/lib/screens/widgets/mini_player_widget.dart @@ -1,7 +1,7 @@ import 'package:audio_service/audio_service.dart'; -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:icons_plus/icons_plus.dart'; import 'package:marquee/marquee.dart'; import 'package:Bloomee/theme_data/default.dart'; import 'package:Bloomee/utils/load_Image.dart'; @@ -159,7 +159,7 @@ class MiniPlayerWidget extends StatelessWidget { .bloomeePlayer .pause(), child: const Icon( - FluentIcons.pause_48_filled, + FontAwesome.pause_solid, size: 30, color: Default_Theme.primaryColor2, ), @@ -175,7 +175,7 @@ class MiniPlayerWidget extends StatelessWidget { .bloomeePlayer .play(), child: const Icon( - FluentIcons.play_48_filled, + MingCute.play_fill, size: 30, color: Default_Theme.primaryColor2, ), @@ -192,7 +192,7 @@ class MiniPlayerWidget extends StatelessWidget { .bloomeePlayer .stop(), icon: const Icon( - Icons.close_rounded, + MingCute.close_fill, size: 30, color: Default_Theme.primaryColor2, ), diff --git a/lib/screens/widgets/playPause_widget.dart b/lib/screens/widgets/playPause_widget.dart index 16023e7..6856485 100644 --- a/lib/screens/widgets/playPause_widget.dart +++ b/lib/screens/widgets/playPause_widget.dart @@ -1,8 +1,8 @@ // ignore_for_file: public_member_api_docs, sort_constructors_first -import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; import 'package:Bloomee/theme_data/default.dart'; +import 'package:icons_plus/icons_plus.dart'; class PlayPauseButton extends StatefulWidget { final double size; @@ -42,7 +42,7 @@ class _PlayPauseButtonState extends State { return GestureDetector( onTap: _togglePlayPause, child: AnimatedContainer( - duration: Duration(milliseconds: 500), + duration: const Duration(milliseconds: 500), child: Container( decoration: BoxDecoration( boxShadow: [ @@ -55,12 +55,12 @@ class _PlayPauseButtonState extends State { height: _size, child: _isPlaying ? const Icon( - FluentIcons.pause_48_filled, + FontAwesome.pause_solid, size: 35, color: Default_Theme.primaryColor1, ) : const Icon( - FluentIcons.play_48_filled, + MingCute.play_fill, size: 35, color: Default_Theme.primaryColor1, ), diff --git a/lib/screens/widgets/singleSongCard_widget.dart b/lib/screens/widgets/singleSongCard_widget.dart index d23ed3f..6180ecf 100644 --- a/lib/screens/widgets/singleSongCard_widget.dart +++ b/lib/screens/widgets/singleSongCard_widget.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:Bloomee/screens/widgets/like_widget.dart'; -import 'package:Bloomee/screens/widgets/unicode_icons.dart'; import 'package:Bloomee/theme_data/default.dart'; import 'package:Bloomee/utils/load_Image.dart'; +import 'package:icons_plus/icons_plus.dart'; class SingleSongCardWidget extends StatelessWidget { final String titleText; @@ -94,10 +94,7 @@ class SingleSongCardWidget extends StatelessWidget { ), Visibility( visible: showOptions, - child: UnicodeIcon( - strCode: "\uf142", - fontColor: Default_Theme.primaryColor2.withOpacity(0.7), - )), + child: const Icon(MingCute.more_2_fill)), ], ) ], diff --git a/lib/screens/widgets/unicode_icons.dart b/lib/screens/widgets/unicode_icons.dart deleted file mode 100644 index 1f76616..0000000 --- a/lib/screens/widgets/unicode_icons.dart +++ /dev/null @@ -1,28 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../theme_data/default.dart'; - -class UnicodeIcon extends StatelessWidget { - final String strCode; - final TextStyle font; - final double fontSize; - final EdgeInsets padding; - final Color fontColor; - const UnicodeIcon({ - Key? key, - this.strCode = "U", - this.font = Default_Theme.fontAwesomeSolidFont, - this.fontSize = 25.0, - this.padding = const EdgeInsets.only(left: 15), - this.fontColor = Default_Theme.primaryColor1, - }) : super(key: key); - - @override - Widget build(BuildContext context) { - return Padding( - padding: padding, - child: Text(strCode, - style: font.merge(TextStyle(color: fontColor, fontSize: fontSize))), - ); - } -} diff --git a/lib/utils/crdcr.dart b/lib/utils/crdcr.dart deleted file mode 100644 index 828abb2..0000000 --- a/lib/utils/crdcr.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'dart:convert'; - -import 'package:dart_des/dart_des.dart'; - -String decryptSongUrl(String cipherString) { - const key = "38346591"; - // ignore: unused_local_variable - final DES desECB = DES(key: key.codeUnits); - final encrypted = base64.decode(cipherString); - final decrypted = desECB.decrypt(encrypted); - final String decoded = utf8 - .decode(decrypted) - .replaceAll(RegExp(r'\.mp4.*'), '.mp4') - .replaceAll(RegExp(r'\.m4a.*'), '.m4a'); - return decoded; -} diff --git a/lib/utils/extentions.dart b/lib/utils/extentions.dart index 56fa5d5..5ee34d5 100644 --- a/lib/utils/extentions.dart +++ b/lib/utils/extentions.dart @@ -1,22 +1,3 @@ -/* - * This file is part of BlackHole (https://github.com/Sangwan5688/BlackHole). - * - * BlackHole is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * BlackHole is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with BlackHole. If not, see . - * - * Copyright (c) 2021-2023, Ankit Sangwan - */ - extension StringExtension on String { String capitalize() { if (this != '') { diff --git a/pubspec.yaml b/pubspec.yaml index b730b40..9b5d312 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -27,15 +27,13 @@ dependencies: sdk: flutter cupertino_icons: ^1.0.2 + icons_plus: ^5.0.0 cached_network_image: ^3.2.3 flutter_bloc: ^8.1.3 dart_des: ^1.0.2 http: ^1.1.0 html: ^0.15.4 logging: ^1.2.0 - unicons: any - feather_icons: ^1.2.0 - fluentui_system_icons: ^1.1.208 google_nav_bar: ^5.0.6 carousel_slider: ^4.2.1 palette_generator: ^0.3.3+2