Enable search ui and search parameter added.

development
Sikander Saleem 5 years ago
parent 834a05e58a
commit 5790adf6d2

@ -53,9 +53,18 @@ class TangheemUserApiClient {
return await ApiClient().postJsonForObject((json) => TangheemType.fromJson(json), url, postParams); return await ApiClient().postJsonForObject((json) => TangheemType.fromJson(json), url, postParams);
} }
Future<AyatTangheemTypeMapped> getAyaTangheemTypeMapped(int surahNo, String tangheemTypeName) async { Future<AyatTangheemTypeMapped> getAyaTangheemTypeMapped(int surahNo, String tangheemTypeName, String ayaText) async {
String url = "${ApiConsts.tangheemUsers}AyatTangheemTypeMapped_Get"; String url = "${ApiConsts.tangheemUsers}AyatTangheemTypeMapped_Get";
var postParams = {"surahNo": surahNo, "tangheemTypeName": tangheemTypeName}; var postParams = {};
if (surahNo != null) {
postParams["surahNo"] = surahNo;
}
if (tangheemTypeName != null) {
postParams["tangheemTypeName"] = tangheemTypeName;
}
if (ayaText != null) {
postParams["ayaText"] = ayaText;
}
return await ApiClient().postJsonForObject((json) => AyatTangheemTypeMapped.fromJson(json), url, postParams); return await ApiClient().postJsonForObject((json) => AyatTangheemTypeMapped.fromJson(json), url, postParams);
} }

@ -49,6 +49,7 @@ class Application extends StatelessWidget {
child: TangheemScreen( child: TangheemScreen(
surah: data["surahData"], surah: data["surahData"],
tangheemTypeName: data["tangheemTypeName"], tangheemTypeName: data["tangheemTypeName"],
tangheemQuery: data["tangheemQuery"],
), ),
); );
break; break;

@ -157,56 +157,56 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
), ),
SizedBox(height: 16), SizedBox(height: 16),
Container(
// todo "Sikander" : hide this search ui, later when we have search requirement, then visible this ui. height: 50,
Visibility( padding: EdgeInsets.only(top: 4, bottom: 6),
visible: false, child: TextField(
child: Container( controller: _searchController,
height: 50, focusNode: _searchFocusNode,
padding: EdgeInsets.only(top: 4, bottom: 6), style: TextStyle(color: ColorConsts.primaryBlack, fontSize: 14),
child: TextField( decoration: InputDecoration(
controller: _searchController, contentPadding: EdgeInsets.fromLTRB(4, 4, 4, 4),
focusNode: _searchFocusNode, alignLabelWithHint: true,
style: TextStyle(color: ColorConsts.primaryBlack, fontSize: 14), fillColor: Colors.white,
decoration: InputDecoration( filled: true,
contentPadding: EdgeInsets.fromLTRB(4, 4, 4, 4), hintStyle: TextStyle(color: ColorConsts.textHintGrey, fontSize: 12),
alignLabelWithHint: true, hintText: "البحث عن سورة أو آية",
fillColor: Colors.white, prefixIconConstraints: BoxConstraints(maxHeight: 16),
filled: true, prefixIcon: Padding(
hintStyle: TextStyle(color: ColorConsts.textHintGrey, fontSize: 12), padding: EdgeInsets.only(right: 6),
hintText: "البحث عن سورة أو آية", child: SvgPicture.asset("assets/icons/search.svg"),
prefixIconConstraints: BoxConstraints(maxHeight: 16), ),
prefixIcon: Padding( suffixIcon: InkWell(
padding: EdgeInsets.only(right: 6), onTap: () async {
child: SvgPicture.asset("assets/icons/search.svg"), _searchFocusNode.unfocus();
), if (_searchController.text.length < 1) {
suffixIcon: InkWell( Utils.showToast("يجب إدخال بعض الكلمات للبحث");
onTap: () async { return;
_searchFocusNode.unfocus(); }
_searchFocusNode.canRequestFocus = false; _searchFocusNode.canRequestFocus = false;
await Navigator.pushNamed(context, QuranScreen.routeName, arguments: _searchController.text); var data = {"tangheemQuery": _searchController.text};
_searchFocusNode.canRequestFocus = true; await Navigator.pushNamed(context, TangheemScreen.routeName, arguments: data);
}, _searchFocusNode.canRequestFocus = true;
splashColor: Colors.transparent, },
highlightColor: Colors.transparent, splashColor: Colors.transparent,
child: Container( highlightColor: Colors.transparent,
alignment: Alignment.center, child: Container(
width: 80, alignment: Alignment.center,
child: Text( width: 80,
"بحث", child: Text(
style: TextStyle(fontSize: 14, color: Colors.white), "بحث",
), style: TextStyle(fontSize: 14, color: Colors.white),
decoration: BoxDecoration( ),
color: ColorConsts.secondaryPink, decoration: BoxDecoration(
borderRadius: BorderRadius.only( color: ColorConsts.secondaryPink,
bottomLeft: Radius.circular(6), borderRadius: BorderRadius.only(
topLeft: Radius.circular(6), bottomLeft: Radius.circular(6),
), topLeft: Radius.circular(6),
), ),
), ),
), ),
border: OutlineInputBorder(borderRadius: BorderRadius.circular(6), borderSide: BorderSide.none),
), ),
border: OutlineInputBorder(borderRadius: BorderRadius.circular(6), borderSide: BorderSide.none),
), ),
), ),
) )

@ -11,9 +11,10 @@ import 'package:tangheem/widgets/text_highlight_widget.dart';
class TangheemScreen extends StatefulWidget { class TangheemScreen extends StatefulWidget {
static const String routeName = "/tangheem"; static const String routeName = "/tangheem";
final tangheemTypeName; final String tangheemQuery;
final String tangheemTypeName;
final SurahModelData surah; final SurahModelData surah;
TangheemScreen({Key key, this.surah, this.tangheemTypeName}) : super(key: key); TangheemScreen({Key key, this.surah, this.tangheemQuery, this.tangheemTypeName}) : super(key: key);
@override @override
_TangheemScreenState createState() { _TangheemScreenState createState() {
@ -23,6 +24,7 @@ class TangheemScreen extends StatefulWidget {
class _TangheemScreenState extends State<TangheemScreen> { class _TangheemScreenState extends State<TangheemScreen> {
AyatTangheemTypeMapped _ayatTangheemTypeMapped; AyatTangheemTypeMapped _ayatTangheemTypeMapped;
List<AyatTangheemTypeMappedData> _dataList;
@override @override
void initState() { void initState() {
@ -33,7 +35,7 @@ class _TangheemScreenState extends State<TangheemScreen> {
void getTangheemData() async { void getTangheemData() async {
Utils.showLoading(context); Utils.showLoading(context);
try { try {
_ayatTangheemTypeMapped = await TangheemUserApiClient().getAyaTangheemTypeMapped(widget.surah.surahID, widget.tangheemTypeName); _ayatTangheemTypeMapped = await TangheemUserApiClient().getAyaTangheemTypeMapped(widget.surah?.surahID, widget.tangheemTypeName, widget.tangheemQuery);
_dataList = _ayatTangheemTypeMapped?.data ?? []; _dataList = _ayatTangheemTypeMapped?.data ?? [];
} catch (ex, tr) { } catch (ex, tr) {
_dataList = []; _dataList = [];
@ -49,8 +51,6 @@ class _TangheemScreenState extends State<TangheemScreen> {
super.dispose(); super.dispose();
} }
List<AyatTangheemTypeMappedData> _dataList;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return _dataList == null return _dataList == null

Loading…
Cancel
Save