From c7cb0c83572cae769711a599aa3adbf31442839a Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 2 May 2021 16:01:35 +0300 Subject: [PATCH] improvements. --- lib/ui/screens/home_screen.dart | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/ui/screens/home_screen.dart b/lib/ui/screens/home_screen.dart index 0604f8d..e90a8f5 100644 --- a/lib/ui/screens/home_screen.dart +++ b/lib/ui/screens/home_screen.dart @@ -48,19 +48,25 @@ class _HomeScreenState extends State { try { _surahModel = await TangheemUserApiClient().getSurahs(); AppState().setSurahModel(_surahModel); - _tangheemType = await TangheemUserApiClient().getTangheemType(); _surahList = _surahModel.data.map((element) => element.nameAR).toList(); - _tangheemList = _tangheemType?.data?.where((element) => element.isActive)?.toList()?.map((element) => element.tangheemTypeName)?.toList() ?? []; - setState(() {}); + await getTangheemTypes(); TangheemUserApiClient().addStatistics(1); + Utils.hideLoading(context); } catch (ex, tr) { print(ex); - Utils.handleException(ex, null); - } finally { Utils.hideLoading(context); + Utils.handleException(ex, null); } } + Future getTangheemTypes() async { + try { + _tangheemType = await TangheemUserApiClient().getTangheemType(); + _tangheemList = _tangheemType?.data?.where((element) => element.isActive)?.toList()?.map((element) => element.tangheemTypeName)?.toList() ?? []; + setState(() {}); + } catch (ex, tr) {} + } + @override void dispose() { super.dispose(); @@ -133,6 +139,7 @@ class _HomeScreenState extends State { var data = {"tangheemTypeName": _tangheemList[_selectedTangheemType], "surahData": _surahModel.data[_selectedSurah]}; await Navigator.pushNamed(context, TangheemScreen.routeName, arguments: data); _searchFocusNode.canRequestFocus = true; + getTangheemTypes(); }, child: Container( height: 36, @@ -188,6 +195,7 @@ class _HomeScreenState extends State { var data = {"tangheemQuery": _searchController.text}; await Navigator.pushNamed(context, TangheemScreen.routeName, arguments: data); _searchFocusNode.canRequestFocus = true; + getTangheemTypes(); }, splashColor: Colors.transparent, highlightColor: Colors.transparent,