icon changed completely to icon_plus

HemantKArya · Mar 15, 2024 · 9b2e99a · 9b2e99a
1 parent 5e1c0cf
commit 9b2e99a
Show file tree

Hide file tree

Showing 22 changed files with 147 additions and 227 deletions.
diff --git 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<AddToPlaylistScreen> {
       ),
       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
@@ -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<AudioPlayerView> {
                         .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<AudioPlayerView> {
                           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<AudioPlayerView> {
                           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
@@ -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
@@ -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<ListOfPlaylists> {
                 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
@@ -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
@@ -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<Playlist> {
                 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<Playlist> {
           //       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
@@ -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,
             ),
           ),
         ],