diff --git a/lib/Component/router.dart b/lib/Component/router.dart index 6c57dbe523089d15b22de8cbb9aa20110352145b..e1ee7a452e48515092f02a7ed7b2f542892d4cf8 100644 --- a/lib/Component/router.dart +++ b/lib/Component/router.dart @@ -155,7 +155,7 @@ class Router { RepositoryProvider.of( context) .dio), - child: Programs() + child: const Programs() )); case detailProgramPage: diff --git a/lib/Pages/Program/bloc_program/program_bloc.dart b/lib/Pages/Program/bloc_program/program_bloc.dart index 53246aba5db8967ea45cf67d616090f210609114..8ed762bb8ef6040342c68c6e7f7e4102179912ab 100644 --- a/lib/Pages/Program/bloc_program/program_bloc.dart +++ b/lib/Pages/Program/bloc_program/program_bloc.dart @@ -60,7 +60,7 @@ class ProgramBloc extends Bloc { } } else if ((event is FetchProgramByStatus) && !_hasReachedMaxSorted(currentState)) { try { - var programs = + final programs = await programRepository.fetchProgram(page: currentState.page + 1); if (currentState is ListProgramsLoaded || currentState is InitialListProgramState) { programs.results.sort((a,b) => b.endDateTime.compareTo(a.endDateTime)); diff --git a/lib/Pages/Program/bloc_program/program_event.dart b/lib/Pages/Program/bloc_program/program_event.dart index 73f39b86e407be6a684ea74df5883576e3bca808..293c49bd8db79372e8c2a298e4b05d8462379e7c 100644 --- a/lib/Pages/Program/bloc_program/program_event.dart +++ b/lib/Pages/Program/bloc_program/program_event.dart @@ -10,3 +10,10 @@ class FetchProgram extends ProgramEvent { @override List get props => []; } + +class FetchProgramByStatus extends ProgramEvent { + const FetchProgramByStatus(); + + @override + List get props => []; +} diff --git a/lib/Pages/Program/program_page.dart b/lib/Pages/Program/program_page.dart index 07134dbb8c98e66740680312e5e62ffffd4eb706..d23529b5be34a517fb767d5d584dc0cf4d1761aa 100644 --- a/lib/Pages/Program/program_page.dart +++ b/lib/Pages/Program/program_page.dart @@ -69,17 +69,17 @@ class _ProgramsState extends State { ), ), bottomNavigationBar: Container( - margin: EdgeInsets.symmetric(horizontal: 25.0), + margin: const EdgeInsets.symmetric(horizontal: 25.0), child: Wrap(children: [ - Padding( - padding: const EdgeInsets.only(top: 20), + const Padding( + padding: EdgeInsets.only(top: 20), child: Text('Urutkan Berdasarkan:', style: TextStyle(fontSize: 16.0),), ), GestureDetector( onTap: () { setState(() { - programList = _ListProgramSortStatus(); + programList = const _ListProgramSortStatus(); }); }, child: FilterButton(sort: 'Status') @@ -87,7 +87,7 @@ class _ProgramsState extends State { GestureDetector( onTap: () { setState(() { - programList = _ListProgram(); + programList = const _ListProgram(); }); }, child: FilterButton(sort: 'Tanggal') @@ -336,7 +336,7 @@ class ProgramCard extends StatelessWidget { class _ProgramDescription extends StatelessWidget { final Program program; - _ProgramDescription({Key key, @required this.program}) + const _ProgramDescription({Key key, @required this.program}) : assert(program != null), super(key: key); @@ -383,7 +383,7 @@ class _ProgramDescription extends StatelessWidget { ), if ( program.endDateTime != null && program.endDateTime.compareTo(CustomizableDateTime.current) < 1) - Text( + const Text( 'Selesai', style: TextStyle(fontWeight: FontWeight.bold), ) @@ -429,7 +429,9 @@ class _DonasiButton extends StatelessWidget { class FilterButton extends StatelessWidget { final String sort; - FilterButton({Key key, @required this.sort}); + FilterButton({Key key, @required this.sort}) + : assert(sort != null), + super(key: key); @override Widget build(BuildContext context) { @@ -442,7 +444,7 @@ class FilterButton extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 10.0), child: Text(sort, - style: TextStyle(color: Colors.white), + style: const TextStyle(color: Colors.white), ), ), );