diff --git a/.gitignore b/.gitignore index cc0b2c8..1f601b7 100644 --- a/.gitignore +++ b/.gitignore @@ -91,7 +91,6 @@ unlinked_spec.ds **/ios/Flutter/Generated.xcconfig **/ios/Flutter/app.flx **/ios/Flutter/app.zip -**/ios/Flutter/.last_build_id **/ios/Flutter/flutter_assets/ **/ios/Flutter/flutter_export_environment.sh **/ios/ServiceDefinitions.json @@ -127,4 +126,7 @@ app.*.map.json !.idea/dictionaries/ # API Keys -api_key.dart \ No newline at end of file +api_key.dart + +# Temporary Remove Github Workflow +.github \ No newline at end of file diff --git a/lib/features/all_song/all_song_cubit.dart b/lib/features/all_song/all_song_cubit.dart deleted file mode 100644 index 300259f..0000000 --- a/lib/features/all_song/all_song_cubit.dart +++ /dev/null @@ -1,71 +0,0 @@ -import 'package:bloc/bloc.dart'; -import 'package:praxis_flutter/models/ui_state.dart'; - -class AllSongCubit extends Cubit> { - // final getTopRandomAlbumsUseCase = GetIt.I.get(); - // final domainMapper = GetIt.I.get(); - - List topAlbumList = []; - List recentSearchedItemList = []; - - AllSongCubit() : super(Initial()) { - loadAlbums(); - } - - List getTopAlbumList() { - return topAlbumList; - } - - List getRecentSearchedList() { - topAlbumList.take(5).forEach((element) { - recentSearchedItemList.add(element); - }); - return recentSearchedItemList; - } - - void loadAlbums() { - emit(Loading()); - // getTopRandomAlbumsUseCase.perform(handleResponse, error, complete); - } - // - // void handleResponse(GetRandomSongListResponse? response) { - // final useCaseResponseAlbums = response?.randomSongList; - // if (useCaseResponseAlbums == null) { - // emit(Failure(exception: Exception("Couldn't fetch Albums!"))); - // } else { - // if (useCaseResponseAlbums is api_response.Failure) { - // emit(Failure( - // exception: (useCaseResponseAlbums as api_response.Failure).error)); - // } else if (useCaseResponseAlbums is api_response.Success) { - // var albums = (useCaseResponseAlbums as api_response.Success); - // final uiAlbums = domainMapper.mapToPresentation(albums.data); - // uiAlbums.songsList.forEach((songUiModel) { - // topAlbumList.add(songUiModel.songName); - // }); - // emit(Success( - // data: AllSongUiStateDataClass( - // uiAlbums, getTopAlbumList(), getRecentSearchedList()))); - // } - // } - // } - - void complete() {} - - error(e) { - emit(Failure(exception: Exception(e))); - } - - @override - Future close() { - // getTopRandomAlbumsUseCase.dispose(); - return super.close(); - } -} - -class AllSongUiStateDataClass { - List allTopAlbumList; - List recentSearchedAlbumList; - - AllSongUiStateDataClass(this.allTopAlbumList, this.recentSearchedAlbumList - ); -} diff --git a/lib/features/all_song/all_song_screen.dart b/lib/features/all_song/all_song_screen.dart deleted file mode 100644 index d4d6de6..0000000 --- a/lib/features/all_song/all_song_screen.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:praxis_flutter/features/all_song/all_song_cubit.dart'; -import 'package:praxis_flutter/features/all_song/all_song_screen_widget.dart'; - -class AllSongScreen extends StatelessWidget { - const AllSongScreen({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return BlocProvider( - create: (_) => AllSongCubit(), - child: const AllSongScreenWidget(), - ); - } -} diff --git a/lib/features/all_song/all_song_screen_widget.dart b/lib/features/all_song/all_song_screen_widget.dart deleted file mode 100644 index 02091ee..0000000 --- a/lib/features/all_song/all_song_screen_widget.dart +++ /dev/null @@ -1,52 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:praxis_flutter/features/all_song/all_song_cubit.dart'; -import 'package:praxis_flutter/models/ui_state.dart'; -import 'package:praxis_flutter/presentation/core/widgets/platform_progress_bar.dart'; - -import '../../ui/component/SearchComponent.dart'; -import '../../ui/component/grid_song_card_widget.dart'; - -class AllSongScreenWidget extends StatelessWidget { - const AllSongScreenWidget({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return BlocBuilder>( - builder: (context, state) { - return Container( - color: const Color(0xffE0DECA), - child: Stack( - alignment: Alignment.center, children: [ - state is Loading - ? const PraxisProgressBar() - : state is Failure - ? const Text("Failure") - : state is Success - ? Padding( - padding: const EdgeInsets.all(8), - child: ListView( - scrollDirection: Axis.vertical, - children: [ - SearchComponent( - recentSearchedCachedList: (state as Success).data.recentSearchedAlbumList, - fetchedSongTitleList: (state as Success).data.allTopAlbumList, - ), - const SizedBox( - height: 8, - ), - GridSongCardWidget( - // songList: (state as Success).data.uiSongsList.songsList - ) - ], - ), - ) - : const Center( - child: - Text("Debug Container Please Remove or Improve it"), - ) - ]), - ); - }); - } -} diff --git a/lib/features/fav_screen/all_fav_song_screen_widget.dart b/lib/features/fav_screen/all_fav_song_screen_widget.dart deleted file mode 100644 index dd2123c..0000000 --- a/lib/features/fav_screen/all_fav_song_screen_widget.dart +++ /dev/null @@ -1,60 +0,0 @@ -import 'dart:ffi'; - -import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:praxis_flutter/features/fav_screen/fav_album_cubit.dart'; -import 'package:praxis_flutter/models/ui_state.dart'; -import 'package:praxis_flutter/presentation/core/widgets/platform_progress_bar.dart'; - -import '../../ui/component/SearchComponent.dart'; -import '../../ui/component/grid_song_card_widget.dart'; - -class AllFavSongScreenWidget extends StatelessWidget { - const AllFavSongScreenWidget({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - context.read().loadFavAlbums(); - return BlocConsumer>( - builder: (context, state) { - return Container( - color: const Color(0xffE0DECA), - child: Stack(alignment: Alignment.center, children: [ - state is Initial - ? const Text("No fav albums added yet") - : state is Loading - ? const PraxisProgressBar() - : state is Failure - ? Text( - "Failure ${(state as Failure).exception.toString()}") - : state is Success - ? Padding( - padding: const EdgeInsets.all(8), - child: ListView( - scrollDirection: Axis.vertical, - children: [ - const SearchComponent( - recentSearchedCachedList: [], - fetchedSongTitleList: [], - ), - const SizedBox( - height: 8, - ), - // GridSongCardWidget(songList: (state as Success).data.songsList) - GridSongCardWidget( - // songList: - // (state as Success).data.songsList - ) - ], - ), - ) - : const Center( - child: Text( - "Debug Container Please Remove or Improve it"), - ) - ]), - ); - }, - listener: (context, state) {}); - } -} diff --git a/lib/features/fav_screen/fav_album_cubit.dart b/lib/features/fav_screen/fav_album_cubit.dart deleted file mode 100644 index 1fa5905..0000000 --- a/lib/features/fav_screen/fav_album_cubit.dart +++ /dev/null @@ -1,55 +0,0 @@ -import 'dart:ffi'; - -import 'package:bloc/bloc.dart'; -import 'package:get_it/get_it.dart'; -import 'package:praxis_flutter/models/ui_state.dart'; - -class FavAlbumsCubit extends Cubit> { - // final getFavAlbumsUseCase = GetIt.I.get(); - // final uiDomainMapper = GetIt.I.get(); - - // Loading data as soon as we init the Cubit - FavAlbumsCubit() : super(Initial()) { - emit(Initial()); - loadFavAlbums(); - } - - void loadFavAlbums() { - emit(Loading()); - // getFavAlbumsUseCase.perform( - // handleDatabaseReadOperation, onErrorCaught, onCompleteProcess); - } - - // void handleDatabaseReadOperation(SongsWithListType? cachedFavAlbums) { - // print("Inside HandleDataBaseOp Method $cachedFavAlbums"); - // var responseCachedList = cachedFavAlbums?.songList ?? []; - // if (responseCachedList.isEmpty) { - // emit(Initial()); - // } else if (responseCachedList.isNotEmpty) { - // emit(Success( - // data: uiDomainMapper.mapToPresentation( - // SongsWithListType(songList: responseCachedList)))); - // } else { - // emit(Failure(exception: Exception("No data found"))); - // } - // } - - onErrorCaught(e) { - emit(Failure(exception: Exception(e))); - } - - onCompleteProcess() { - print("On Complete called"); - } - - @override - Future close() async { - // getFavAlbumsUseCase.dispose(); - super.close(); - } - - // @override - // void onChange(Change> change) { - // super.onChange(change); - // } -} diff --git a/lib/features/fav_screen/fav_song_screen.dart b/lib/features/fav_screen/fav_song_screen.dart deleted file mode 100644 index b71c335..0000000 --- a/lib/features/fav_screen/fav_song_screen.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:praxis_flutter/features/fav_screen/all_fav_song_screen_widget.dart'; -import 'package:praxis_flutter/features/fav_screen/fav_album_cubit.dart'; - -class FavSongScreen extends StatelessWidget { - const FavSongScreen({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return BlocProvider( - create: (_) => FavAlbumsCubit(), - child: const AllFavSongScreenWidget(), - ); - } -} \ No newline at end of file diff --git a/lib/features/song_list/SongListScreen.dart b/lib/features/song_list/song_list_screen.dart similarity index 99% rename from lib/features/song_list/SongListScreen.dart rename to lib/features/song_list/song_list_screen.dart index 60e2d4e..6575269 100644 --- a/lib/features/song_list/SongListScreen.dart +++ b/lib/features/song_list/song_list_screen.dart @@ -1,10 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; import 'package:praxis_flutter/design_system/spotify_color.dart'; import 'package:praxis_flutter/design_system/spotify_text.dart'; -import 'package:praxis_flutter/design_system/spotify_text_input.dart'; import 'package:praxis_flutter/features/song_list/track_list_cubit.dart'; import 'package:praxis_flutter/models/ui_state.dart'; import 'package:praxis_flutter/routing/routes.dart'; diff --git a/lib/routing/routes.dart b/lib/routing/routes.dart index 8a72156..9ce6272 100644 --- a/lib/routing/routes.dart +++ b/lib/routing/routes.dart @@ -1,17 +1,13 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; -import 'package:praxis_flutter/features/song_list/SongListScreen.dart'; +import 'package:praxis_flutter/features/song_list/song_list_screen.dart'; import 'package:praxis_flutter/features/song_play/host/song_carousel_host.dart'; -import 'package:praxis_flutter/features/spotify_home/spotify_home_screen.dart'; import 'package:praxis_flutter/features/spotify_library/spotify_library_screen.dart'; import 'package:praxis_flutter/features/spotify_profile/spotify_profile_view.dart'; import 'package:praxis_flutter/features/spotify_search/host/spotify_search_host.dart'; -import 'package:praxis_flutter/features/spotify_search/search/spotify_search_bloc.dart'; import 'package:praxis_flutter/features/spotify_search/search/spotify_search_screen.dart'; import 'package:praxis_flutter/features/spotify_splash/SpotifySplashScreen.dart'; -import 'package:praxis_flutter/models/TrackUiModel.dart'; import 'ScaffoldWithNestedNavigation.dart'; final _rootNavigationKey = GlobalKey();