diff --git a/lib/ui/common_appbar.dart b/lib/ui/common_appbar.dart index 95d60b8..8f5da20 100644 --- a/lib/ui/common_appbar.dart +++ b/lib/ui/common_appbar.dart @@ -319,7 +319,7 @@ class _CommonAppbarState extends State { icon: SvgPicture.asset("assets/icons/fa_key.svg", height: 25, width: 30, color: ColorConsts.textGrey1), itemBuilder: (_) => >[ PopupMenuItem( - value: 1, + value: 0, padding: EdgeInsets.fromLTRB(0, 0, 0, 0), height: 24, child: Center( diff --git a/lib/ui/screens/tangheem_detail_screen.dart b/lib/ui/screens/tangheem_detail_screen.dart index 698cc4c..3259884 100644 --- a/lib/ui/screens/tangheem_detail_screen.dart +++ b/lib/ui/screens/tangheem_detail_screen.dart @@ -267,13 +267,14 @@ class _TangheemDetailScreenState extends State { itemCount: ayatTangheemTypeMappedDataList.length > 5 ? 5 : ayatTangheemTypeMappedDataList.length, itemBuilder: (context, index) { final _ayatTangheemTypeMappedData = ayatTangheemTypeMappedDataList[index]; - + _ayatTangheemTypeMappedData.property?.sort((a, b) => a.orderNo.compareTo(b.orderNo)); List _tangheemInsideTableList = []; List _tangheemAboveTableList = []; List _tangheemBelowTableList = []; List _tangheemWords = []; - List _tempPropertyList = [] + _ayatTangheemTypeMappedData?.property ?? []; + List _tempPropertyList = []; + _tempPropertyList.addAll(_ayatTangheemTypeMappedData?.property ?? []); int firstIndex = _tempPropertyList.indexWhere((element) => element.isInsideTable); if (firstIndex >= 0) {