diff --git a/lib/page/informasi/list_kegiatan.dart b/lib/page/informasi/list_kegiatan.dart index a159f12899264eb30a59d25aa74a118357bc98fd..06f27818211c2f3e7b4276a8ddb9dacdd945ff7c 100644 --- a/lib/page/informasi/list_kegiatan.dart +++ b/lib/page/informasi/list_kegiatan.dart @@ -73,7 +73,7 @@ class _ListKegiatanState extends State { children: [ const Padding( padding: EdgeInsets.only( - top: tripleSpace, left: doubleSpace, right: doubleSpace), + top: doubleSpace, left: doubleSpace, right: doubleSpace), child: Text( 'Agenda Kegiatan' ?? '', style: TextStyle( @@ -138,7 +138,7 @@ class _ListKegiatanState extends State { Widget makeKegiatanWidget(String key, KegiatanModel kegiatan) { return InkWell( - key: Key('$key-${kegiatan.namaKegiatan}'), + key: Key('$key-${kegiatan.id}'), onTap: () { _navigateToDetailKegiatanPage(context, kegiatan); }, diff --git a/lib/utils/custom_dropdown_sort_kegiatan.dart b/lib/utils/custom_dropdown_sort_kegiatan.dart index 79d31fa3668d75ff948318bd7d30ebda92fc105e..7cfd0ce107446af0b57cecfa4409f3bc96448fd0 100644 --- a/lib/utils/custom_dropdown_sort_kegiatan.dart +++ b/lib/utils/custom_dropdown_sort_kegiatan.dart @@ -55,56 +55,50 @@ class _CustomDropdownState extends State { @override Widget build(BuildContext context) { return Container( - margin: const EdgeInsets.symmetric(vertical: 10), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + margin: const EdgeInsets.only( + top: tripleSpace, + left: doubleSpace, + right: doubleSpace,), + child: Row( + //crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ RichText( key: Key(widget.title), text: TextSpan( text: widget.title, style: TextStyle( - fontSize: widget.title == '' ? 0 : 18, + fontSize: widget.title == '' ? 0 : 15, color: Colors.black, fontFamily: 'Muli'), - children: [ - if (widget.required) - const TextSpan(text: '', style: TextStyle(color: red)), - ], ), ), - const SizedBox( - height: 10, - ), - DropdownButtonFormField( - onSaved: widget.onSaved, - validator: widget.validator, - style: const TextStyle( - color: Colors.black, - fontSize: 15, - ), - decoration: InputDecoration( - hintStyle: - const TextStyle(fontWeight: FontWeight.bold, fontSize: 15), - hintText: widget.hint, - contentPadding: const EdgeInsets.all(8.0), - enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(10), - borderSide: BorderSide( - color: Theme.of(context).primaryColor, - ), + + // Container width and fontSize are bounded, re-adjust required after any change(s) + Container( + width: 170, + child:DropdownButtonFormField( + isExpanded: true, + onSaved: widget.onSaved, + validator: widget.validator, + style: const TextStyle( + color: Colors.black, + fontSize: 15, + fontFamily: 'Muli', + fontWeight: FontWeight.bold, ), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(10), - borderSide: BorderSide( - color: Theme.of(context).primaryColor, - ), + decoration: InputDecoration.collapsed( + hintStyle: + const TextStyle( + fontSize: 15, + fontFamily: 'Muli', + fontWeight: FontWeight.bold,), + hintText: widget.hint, ), - ), - value: widget.value, - items: _dropdownMenuItems, - onChanged: widget.onChanged, - ), + value: widget.value, + items: _dropdownMenuItems, + onChanged: widget.onChanged, + ),), ], ), );