code cleaning and formating.

development
Sikander Saleem 5 years ago
parent ac563c7f71
commit 0502e8ce7d

@ -6,7 +6,9 @@ import 'api_client.dart';
class AdminConfigurationApiClient { class AdminConfigurationApiClient {
static final AdminConfigurationApiClient _instance = AdminConfigurationApiClient._internal(); static final AdminConfigurationApiClient _instance = AdminConfigurationApiClient._internal();
AdminConfigurationApiClient._internal(); AdminConfigurationApiClient._internal();
factory AdminConfigurationApiClient() => _instance; factory AdminConfigurationApiClient() => _instance;
Future<GeneralResponseModel> addDiscussion(String discussionText, String ayaTangheemTypeId) async { Future<GeneralResponseModel> addDiscussion(String discussionText, String ayaTangheemTypeId) async {

@ -49,7 +49,9 @@ APIException _throwAPIException(Response response) {
class ApiClient { class ApiClient {
static final ApiClient _instance = ApiClient._internal(); static final ApiClient _instance = ApiClient._internal();
ApiClient._internal(); ApiClient._internal();
factory ApiClient() => _instance; factory ApiClient() => _instance;
Future<U> postJsonForObject<T, U>(FactoryConstructor<U> factoryConstructor, String url, T jsonObject, Future<U> postJsonForObject<T, U>(FactoryConstructor<U> factoryConstructor, String url, T jsonObject,

@ -1,10 +1,13 @@
import 'package:tangheem/classes/consts.dart'; import 'package:tangheem/classes/consts.dart';
import 'package:tangheem/models/authentication_user_model.dart'; import 'package:tangheem/models/authentication_user_model.dart';
import 'api_client.dart'; import 'api_client.dart';
class AuthenticationApiClient { class AuthenticationApiClient {
static final AuthenticationApiClient _instance = AuthenticationApiClient._internal(); static final AuthenticationApiClient _instance = AuthenticationApiClient._internal();
AuthenticationApiClient._internal(); AuthenticationApiClient._internal();
factory AuthenticationApiClient() => _instance; factory AuthenticationApiClient() => _instance;
Future<AuthenticationUserModel> authenticateUser(String email, String password) async { Future<AuthenticationUserModel> authenticateUser(String email, String password) async {

@ -1,5 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'package:tangheem/classes/consts.dart';
import 'package:tangheem/models/aya_model.dart';
import 'package:tangheem/models/aya_tangheem_property.dart'; import 'package:tangheem/models/aya_tangheem_property.dart';
import 'package:tangheem/models/aya_tangheem_type.dart'; import 'package:tangheem/models/aya_tangheem_type.dart';
import 'package:tangheem/models/aya_tangheem_type_mapped.dart'; import 'package:tangheem/models/aya_tangheem_type_mapped.dart';
@ -10,15 +12,16 @@ import 'package:tangheem/models/general_response_model.dart';
import 'package:tangheem/models/member_model.dart'; import 'package:tangheem/models/member_model.dart';
import 'package:tangheem/models/navigation_model.dart'; import 'package:tangheem/models/navigation_model.dart';
import 'package:tangheem/models/quick_links_model.dart'; import 'package:tangheem/models/quick_links_model.dart';
import 'package:tangheem/models/surah_model.dart';
import 'package:tangheem/models/tangheem_type_model.dart'; import 'package:tangheem/models/tangheem_type_model.dart';
import 'api_client.dart'; import 'api_client.dart';
import 'package:tangheem/classes/consts.dart';
import 'package:tangheem/models/aya_model.dart';
import 'package:tangheem/models/surah_model.dart';
class TangheemUserApiClient { class TangheemUserApiClient {
static final TangheemUserApiClient _instance = TangheemUserApiClient._internal(); static final TangheemUserApiClient _instance = TangheemUserApiClient._internal();
TangheemUserApiClient._internal(); TangheemUserApiClient._internal();
factory TangheemUserApiClient() => _instance; factory TangheemUserApiClient() => _instance;
Future<SurahModel> getSurahs() async { Future<SurahModel> getSurahs() async {

@ -1,11 +1,14 @@
import 'package:tangheem/classes/consts.dart'; import 'package:tangheem/classes/consts.dart';
import 'package:tangheem/models/country_model.dart'; import 'package:tangheem/models/country_model.dart';
import 'package:tangheem/models/general_response_model.dart'; import 'package:tangheem/models/general_response_model.dart';
import 'api_client.dart'; import 'api_client.dart';
class UserApiClient { class UserApiClient {
static final UserApiClient _instance = UserApiClient._internal(); static final UserApiClient _instance = UserApiClient._internal();
UserApiClient._internal(); UserApiClient._internal();
factory UserApiClient() => _instance; factory UserApiClient() => _instance;
Future<GeneralResponseModel> registerUser( Future<GeneralResponseModel> registerUser(

@ -1,34 +1,45 @@
import 'package:tangheem/models/authentication_user_model.dart';
import 'package:tangheem/models/content_info_model.dart'; import 'package:tangheem/models/content_info_model.dart';
import 'package:tangheem/models/navigation_model.dart'; import 'package:tangheem/models/navigation_model.dart';
import 'package:tangheem/models/surah_model.dart'; import 'package:tangheem/models/surah_model.dart';
import 'package:tangheem/models/authentication_user_model.dart';
class AppState { class AppState {
static final AppState _instance = AppState._internal(); static final AppState _instance = AppState._internal();
AppState._internal(); AppState._internal();
factory AppState() => _instance; factory AppState() => _instance;
SurahModel _surahModel; SurahModel _surahModel;
SurahModel get getSurahModel => _surahModel; SurahModel get getSurahModel => _surahModel;
void setSurahModel(SurahModel _surahModel) { void setSurahModel(SurahModel _surahModel) {
this._surahModel = _surahModel; this._surahModel = _surahModel;
} }
ContentInfoDataModel _copyRight; ContentInfoDataModel _copyRight;
ContentInfoDataModel get getContentInfoModel => _copyRight; ContentInfoDataModel get getContentInfoModel => _copyRight;
void setContentInfoModel(ContentInfoDataModel _copyRight) { void setContentInfoModel(ContentInfoDataModel _copyRight) {
this._copyRight = _copyRight; this._copyRight = _copyRight;
} }
AuthenticationUserModel _authenticationUser; AuthenticationUserModel _authenticationUser;
bool get isUserLogin => _authenticationUser != null; bool get isUserLogin => _authenticationUser != null;
String get token => _authenticationUser?.result?.data?.token; String get token => _authenticationUser?.result?.data?.token;
void setAuthenticationModel(AuthenticationUserModel _authenticationUser) { void setAuthenticationModel(AuthenticationUserModel _authenticationUser) {
this._authenticationUser = _authenticationUser; this._authenticationUser = _authenticationUser;
} }
NavigationModel _navigationModel; NavigationModel _navigationModel;
NavigationModel get getNavigationModel => _navigationModel; NavigationModel get getNavigationModel => _navigationModel;
void setNavigationModel(NavigationModel _navigationModel) { void setNavigationModel(NavigationModel _navigationModel) {
this._navigationModel = _navigationModel; this._navigationModel = _navigationModel;
} }

@ -2,11 +2,14 @@ import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart'; import 'package:fluttertoast/fluttertoast.dart';
import 'package:tangheem/exceptions/api_exception.dart'; import 'package:tangheem/exceptions/api_exception.dart';
import 'package:tangheem/ui/dialogs/loading_dialog.dart'; import 'package:tangheem/ui/dialogs/loading_dialog.dart';
import 'colors.dart'; import 'colors.dart';
class Utils { class Utils {
static bool _isLoadingVisible = false; static bool _isLoadingVisible = false;
static bool get isLoading => _isLoadingVisible; static bool get isLoading => _isLoadingVisible;
static void showToast(String message) { static void showToast(String message) {
Fluttertoast.showToast( Fluttertoast.showToast(
msg: message, toastLength: Toast.LENGTH_SHORT, gravity: ToastGravity.BOTTOM, timeInSecForIosWeb: 1, backgroundColor: Colors.black54, textColor: Colors.white, fontSize: 16.0); msg: message, toastLength: Toast.LENGTH_SHORT, gravity: ToastGravity.BOTTOM, timeInSecForIosWeb: 1, backgroundColor: Colors.black54, textColor: Colors.white, fontSize: 16.0);

@ -1,4 +1,5 @@
import 'dart:convert'; import 'dart:convert';
import 'package:tangheem/api/api_client.dart'; import 'package:tangheem/api/api_client.dart';
class APIException implements Exception { class APIException implements Exception {

@ -7,14 +7,15 @@ import 'package:tangheem/ui/screens/contact_us_screen.dart';
import 'package:tangheem/ui/screens/content_info_screen.dart'; import 'package:tangheem/ui/screens/content_info_screen.dart';
import 'package:tangheem/ui/screens/member_screen.dart'; import 'package:tangheem/ui/screens/member_screen.dart';
import 'package:tangheem/ui/screens/pdf_viewer_screen.dart'; import 'package:tangheem/ui/screens/pdf_viewer_screen.dart';
import 'classes/colors.dart';
import 'ui/common_appbar.dart'; import 'ui/common_appbar.dart';
import 'ui/screens/forgot_password_screen.dart'; import 'ui/screens/forgot_password_screen.dart';
import 'ui/screens/home_screen.dart'; import 'ui/screens/home_screen.dart';
import 'ui/screens/login_screen.dart'; import 'ui/screens/login_screen.dart';
import 'ui/screens/registration_screen.dart';
import 'ui/screens/quran_screen.dart'; import 'ui/screens/quran_screen.dart';
import 'ui/screens/registration_screen.dart';
import 'ui/screens/tangheem_detail_screen.dart'; import 'ui/screens/tangheem_detail_screen.dart';
import 'classes/colors.dart';
import 'ui/screens/tangheem_screen.dart'; import 'ui/screens/tangheem_screen.dart';
void main() { void main() {

@ -4,8 +4,7 @@ class AyaTangheemProperty {
String message; String message;
List<AyaTangheemPropertyData> data; List<AyaTangheemPropertyData> data;
AyaTangheemProperty( AyaTangheemProperty({this.totalItemsCount, this.statusCode, this.message, this.data});
{this.totalItemsCount, this.statusCode, this.message, this.data});
AyaTangheemProperty.fromJson(Map<String, dynamic> json) { AyaTangheemProperty.fromJson(Map<String, dynamic> json) {
totalItemsCount = json['totalItemsCount']; totalItemsCount = json['totalItemsCount'];
@ -47,17 +46,17 @@ class AyaTangheemPropertyData {
AyaTangheemPropertyData( AyaTangheemPropertyData(
{this.ayaTangheemTypePropertyId, {this.ayaTangheemTypePropertyId,
this.ayaTangheemTypeId, this.ayaTangheemTypeId,
this.tangheemTypePropertyId, this.tangheemTypePropertyId,
this.propertyValue, this.propertyValue,
this.surahNo, this.surahNo,
this.ayaNo, this.ayaNo,
this.ayaText, this.ayaText,
this.propertyText, this.propertyText,
this.tangheemTypeName, this.tangheemTypeName,
this.tangheemTypeId, this.tangheemTypeId,
this.isInsideTable, this.isInsideTable,
this.orderNo}); this.orderNo});
AyaTangheemPropertyData.fromJson(Map<String, dynamic> json) { AyaTangheemPropertyData.fromJson(Map<String, dynamic> json) {
ayaTangheemTypePropertyId = json['ayaTangheemTypePropertyId']; ayaTangheemTypePropertyId = json['ayaTangheemTypePropertyId'];

@ -4,8 +4,7 @@ class ContentInfoModel {
String message; String message;
List<ContentInfoDataModel> data; List<ContentInfoDataModel> data;
ContentInfoModel( ContentInfoModel({this.totalItemsCount, this.statusCode, this.message, this.data});
{this.totalItemsCount, this.statusCode, this.message, this.data});
ContentInfoModel.fromJson(Map<String, dynamic> json) { ContentInfoModel.fromJson(Map<String, dynamic> json) {
totalItemsCount = json['totalItemsCount']; totalItemsCount = json['totalItemsCount'];
@ -40,14 +39,7 @@ class ContentInfoDataModel {
String fileName; String fileName;
String exposeFilePath; String exposeFilePath;
ContentInfoDataModel( ContentInfoDataModel({this.contentInfoId, this.contentTypeId, this.content, this.contentTypeNameEn, this.contentTypeNameAr, this.fileName, this.exposeFilePath});
{this.contentInfoId,
this.contentTypeId,
this.content,
this.contentTypeNameEn,
this.contentTypeNameAr,
this.fileName,
this.exposeFilePath});
ContentInfoDataModel.fromJson(Map<String, dynamic> json) { ContentInfoDataModel.fromJson(Map<String, dynamic> json) {
contentInfoId = json['contentInfoId']; contentInfoId = json['contentInfoId'];

@ -4,8 +4,7 @@ class CountryModel {
String message; String message;
List<CountryModelData> data; List<CountryModelData> data;
CountryModel( CountryModel({this.totalItemsCount, this.statusCode, this.message, this.data});
{this.totalItemsCount, this.statusCode, this.message, this.data});
CountryModel.fromJson(Map<String, dynamic> json) { CountryModel.fromJson(Map<String, dynamic> json) {
totalItemsCount = json['totalItemsCount']; totalItemsCount = json['totalItemsCount'];
@ -38,12 +37,7 @@ class CountryModelData {
String countryNameAr; String countryNameAr;
String countryFlag; String countryFlag;
CountryModelData( CountryModelData({this.countryId, this.countryCode, this.countryNameEn, this.countryNameAr, this.countryFlag});
{this.countryId,
this.countryCode,
this.countryNameEn,
this.countryNameAr,
this.countryFlag});
CountryModelData.fromJson(Map<String, dynamic> json) { CountryModelData.fromJson(Map<String, dynamic> json) {
countryId = json['countryId']; countryId = json['countryId'];

@ -4,8 +4,7 @@ class DiscussionModel {
String message; String message;
List<DiscussionModelData> data; List<DiscussionModelData> data;
DiscussionModel( DiscussionModel({this.totalItemsCount, this.statusCode, this.message, this.data});
{this.totalItemsCount, this.statusCode, this.message, this.data});
DiscussionModel.fromJson(Map<String, dynamic> json) { DiscussionModel.fromJson(Map<String, dynamic> json) {
totalItemsCount = json['totalItemsCount']; totalItemsCount = json['totalItemsCount'];
@ -48,18 +47,18 @@ class DiscussionModelData {
DiscussionModelData( DiscussionModelData(
{this.discussionId, {this.discussionId,
this.discussionText, this.discussionText,
this.ayaTangheemTypeId, this.ayaTangheemTypeId,
this.statusId, this.statusId,
this.status, this.status,
this.isResponse, this.isResponse,
this.responseId, this.responseId,
this.userName, this.userName,
this.ayaText, this.ayaText,
this.highlightText, this.highlightText,
this.adminResponse, this.adminResponse,
this.adminDiscussionId, this.adminDiscussionId,
this.date}); this.date});
DiscussionModelData.fromJson(Map<String, dynamic> json) { DiscussionModelData.fromJson(Map<String, dynamic> json) {
discussionId = json['discussionId']; discussionId = json['discussionId'];

@ -38,13 +38,7 @@ class MemberDataModel {
String picture; String picture;
int orderNo; int orderNo;
MemberDataModel( MemberDataModel({this.committeeId, this.firstName, this.lastName, this.description, this.picture, this.orderNo});
{this.committeeId,
this.firstName,
this.lastName,
this.description,
this.picture,
this.orderNo});
MemberDataModel.fromJson(Map<String, dynamic> json) { MemberDataModel.fromJson(Map<String, dynamic> json) {
committeeId = json['committeeId']; committeeId = json['committeeId'];

@ -4,8 +4,7 @@ class NavigationModel {
String message; String message;
List<NavigationDataModel> data; List<NavigationDataModel> data;
NavigationModel( NavigationModel({this.totalItemsCount, this.statusCode, this.message, this.data});
{this.totalItemsCount, this.statusCode, this.message, this.data});
NavigationModel.fromJson(Map<String, dynamic> json) { NavigationModel.fromJson(Map<String, dynamic> json) {
totalItemsCount = json['totalItemsCount']; totalItemsCount = json['totalItemsCount'];
@ -44,16 +43,7 @@ class NavigationDataModel {
int roleId; int roleId;
NavigationDataModel( NavigationDataModel(
{this.navigationId, {this.navigationId, this.navigationText, this.navigationUrl, this.mobileNavigationUrl, this.categoryName, this.fontIcon, this.mobileFontIcon, this.parentId, this.orderNo, this.roleId});
this.navigationText,
this.navigationUrl,
this.mobileNavigationUrl,
this.categoryName,
this.fontIcon,
this.mobileFontIcon,
this.parentId,
this.orderNo,
this.roleId});
NavigationDataModel.fromJson(Map<String, dynamic> json) { NavigationDataModel.fromJson(Map<String, dynamic> json) {
navigationId = json['navigationId']; navigationId = json['navigationId'];

@ -40,15 +40,7 @@ class QuickLinksData {
String fileName; String fileName;
String exposeFilePath; String exposeFilePath;
QuickLinksData( QuickLinksData({this.quickLinksId, this.displayText, this.description, this.imageUrl, this.position, this.orderNo, this.fileName, this.exposeFilePath});
{this.quickLinksId,
this.displayText,
this.description,
this.imageUrl,
this.position,
this.orderNo,
this.fileName,
this.exposeFilePath});
QuickLinksData.fromJson(Map<String, dynamic> json) { QuickLinksData.fromJson(Map<String, dynamic> json) {
quickLinksId = json['quickLinksId']; quickLinksId = json['quickLinksId'];

@ -42,17 +42,7 @@ class SurahModelData {
int startPageNo; int startPageNo;
int endPageNo; int endPageNo;
SurahModelData( SurahModelData({this.id, this.surahID, this.nameAR, this.nameEN, this.numberOfAyahs, this.englishNameTranslation, this.revelationID, this.revelationType, this.startPageNo, this.endPageNo});
{this.id,
this.surahID,
this.nameAR,
this.nameEN,
this.numberOfAyahs,
this.englishNameTranslation,
this.revelationID,
this.revelationType,
this.startPageNo,
this.endPageNo});
SurahModelData.fromJson(Map<String, dynamic> json) { SurahModelData.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];

@ -4,8 +4,7 @@ class TangheemType {
String message; String message;
List<TangheemTypeData> data; List<TangheemTypeData> data;
TangheemType( TangheemType({this.totalItemsCount, this.statusCode, this.message, this.data});
{this.totalItemsCount, this.statusCode, this.message, this.data});
TangheemType.fromJson(Map<String, dynamic> json) { TangheemType.fromJson(Map<String, dynamic> json) {
totalItemsCount = json['totalItemsCount']; totalItemsCount = json['totalItemsCount'];

@ -6,6 +6,7 @@ import 'package:tangheem/widgets/common_textfield_widget.dart';
class CountrySelectionBottomSheet extends StatefulWidget { class CountrySelectionBottomSheet extends StatefulWidget {
final List<CountryModelData> countryList; final List<CountryModelData> countryList;
final Function(CountryModelData) onSelectCountry; final Function(CountryModelData) onSelectCountry;
CountrySelectionBottomSheet({Key key, this.countryList, this.onSelectCountry}) : super(key: key); CountrySelectionBottomSheet({Key key, this.countryList, this.onSelectCountry}) : super(key: key);
@override @override

@ -10,10 +10,8 @@ import 'package:tangheem/models/content_info_model.dart';
import 'package:tangheem/models/navigation_model.dart'; import 'package:tangheem/models/navigation_model.dart';
import 'package:tangheem/models/quick_links_model.dart'; import 'package:tangheem/models/quick_links_model.dart';
import 'package:tangheem/ui/screens/bookmark_screen.dart'; import 'package:tangheem/ui/screens/bookmark_screen.dart';
import 'package:tangheem/ui/screens/contact_us_screen.dart';
import 'package:tangheem/ui/screens/content_info_screen.dart'; import 'package:tangheem/ui/screens/content_info_screen.dart';
import 'package:tangheem/ui/screens/login_screen.dart'; import 'package:tangheem/ui/screens/login_screen.dart';
import 'package:tangheem/ui/screens/quran_screen.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
class CommonAppbar extends StatefulWidget { class CommonAppbar extends StatefulWidget {
@ -78,7 +76,7 @@ class _CommonAppbarState extends State<CommonAppbar> {
if (widget.showDrawer) { if (widget.showDrawer) {
try { try {
quickLinks = (await TangheemUserApiClient().quickLinks())?.data ?? []; quickLinks = (await TangheemUserApiClient().quickLinks())?.data ?? [];
quickLinks = quickLinks.where((element) => element.position=="down").toList(); quickLinks = quickLinks.where((element) => element.position == "down").toList();
quickLinks.sort((a, b) => a.orderNo.compareTo(b.orderNo)); quickLinks.sort((a, b) => a.orderNo.compareTo(b.orderNo));
} catch (ex) {} } catch (ex) {}
setState(() {}); setState(() {});
@ -87,6 +85,7 @@ class _CommonAppbarState extends State<CommonAppbar> {
int fontSize; int fontSize;
SharedPreferences prefs; SharedPreferences prefs;
void getPrefs() async { void getPrefs() async {
prefs = await SharedPreferences.getInstance(); prefs = await SharedPreferences.getInstance();
fontSize = prefs.getInt(GlobalConsts.fontZoomSize) ?? 18; fontSize = prefs.getInt(GlobalConsts.fontZoomSize) ?? 18;

@ -1,14 +1,13 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:tangheem/api/user_api_client.dart';
import 'package:tangheem/classes/colors.dart'; import 'package:tangheem/classes/colors.dart';
import 'package:tangheem/classes/utils.dart'; import 'package:tangheem/classes/utils.dart';
import 'package:tangheem/widgets/common_textfield_widget.dart'; import 'package:tangheem/widgets/common_textfield_widget.dart';
import 'package:tangheem/widgets/otp_widget.dart';
class ChangePasswordDialog extends StatefulWidget { class ChangePasswordDialog extends StatefulWidget {
final Function(String) onPassword; final Function(String) onPassword;
ChangePasswordDialog({Key key, this.onPassword}) : super(key: key); ChangePasswordDialog({Key key, this.onPassword}) : super(key: key);
@override @override

@ -1,14 +1,13 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:tangheem/api/user_api_client.dart';
import 'package:tangheem/classes/colors.dart'; import 'package:tangheem/classes/colors.dart';
import 'package:tangheem/classes/utils.dart'; import 'package:tangheem/classes/utils.dart';
import 'package:tangheem/widgets/common_textfield_widget.dart'; import 'package:tangheem/widgets/common_textfield_widget.dart';
import 'package:tangheem/widgets/otp_widget.dart';
class DiscussionInputDialog extends StatefulWidget { class DiscussionInputDialog extends StatefulWidget {
final Function(String) onCommentPress; final Function(String) onCommentPress;
DiscussionInputDialog({Key key, this.onCommentPress}) : super(key: key); DiscussionInputDialog({Key key, this.onCommentPress}) : super(key: key);
@override @override

@ -1,4 +1,4 @@
import 'dart:io';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

@ -1,13 +1,13 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:tangheem/api/user_api_client.dart';
import 'package:tangheem/classes/colors.dart'; import 'package:tangheem/classes/colors.dart';
import 'package:tangheem/classes/utils.dart'; import 'package:tangheem/classes/utils.dart';
import 'package:tangheem/widgets/otp_widget.dart'; import 'package:tangheem/widgets/otp_widget.dart';
class OTPDialog extends StatefulWidget { class OTPDialog extends StatefulWidget {
final Function(int) onOTP; final Function(int) onOTP;
OTPDialog({Key key, this.onOTP}) : super(key: key); OTPDialog({Key key, this.onOTP}) : super(key: key);
@override @override

@ -13,6 +13,7 @@ class BookmarkScreen extends StatefulWidget {
final String tangheemQuery; final String tangheemQuery;
final String tangheemTypeName; final String tangheemTypeName;
final SurahModelData surah; final SurahModelData surah;
BookmarkScreen({Key key, this.surah, this.tangheemQuery, this.tangheemTypeName}) : super(key: key); BookmarkScreen({Key key, this.surah, this.tangheemQuery, this.tangheemTypeName}) : super(key: key);
@override @override
@ -46,6 +47,7 @@ class _BookmarkScreenState extends State<BookmarkScreen> {
// _fabColor = isOpen! ? Colors.green : Colors.blue; // _fabColor = isOpen! ? Colors.green : Colors.blue;
// }); // });
} }
void getBookMark() async { void getBookMark() async {
Utils.showLoading(context); Utils.showLoading(context);
_bookMarkList = await BookMarkModel.getFromPrefs(); _bookMarkList = await BookMarkModel.getFromPrefs();

@ -8,6 +8,7 @@ import 'package:tangheem/widgets/common_textfield_widget.dart';
class ContactUsScreen extends StatefulWidget { class ContactUsScreen extends StatefulWidget {
static const String routeName = "/contact_us"; static const String routeName = "/contact_us";
ContactUsScreen({Key key}) : super(key: key); ContactUsScreen({Key key}) : super(key: key);
@override @override

@ -1,4 +1,3 @@
import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
@ -6,12 +5,12 @@ import 'package:tangheem/api/tangheem_user_api_client.dart';
import 'package:tangheem/classes/colors.dart'; import 'package:tangheem/classes/colors.dart';
import 'package:tangheem/classes/utils.dart'; import 'package:tangheem/classes/utils.dart';
import 'package:tangheem/models/content_info_model.dart'; import 'package:tangheem/models/content_info_model.dart';
import 'package:tangheem/models/member_model.dart';
import 'package:tangheem/ui/misc/no_data_ui.dart'; import 'package:tangheem/ui/misc/no_data_ui.dart';
class ContentInfoScreen extends StatefulWidget { class ContentInfoScreen extends StatefulWidget {
static const String routeName = "/content_info"; static const String routeName = "/content_info";
final int contentId; final int contentId;
ContentInfoScreen({Key key, this.contentId}) : super(key: key); ContentInfoScreen({Key key, this.contentId}) : super(key: key);
@override @override

@ -3,11 +3,11 @@ import 'package:flutter_svg/svg.dart';
import 'package:tangheem/api/user_api_client.dart'; import 'package:tangheem/api/user_api_client.dart';
import 'package:tangheem/classes/colors.dart'; import 'package:tangheem/classes/colors.dart';
import 'package:tangheem/classes/utils.dart'; import 'package:tangheem/classes/utils.dart';
import 'package:tangheem/extensions/string_extensions.dart';
import 'package:tangheem/models/general_response_model.dart'; import 'package:tangheem/models/general_response_model.dart';
import 'package:tangheem/ui/dialogs/change_password_dialog.dart'; import 'package:tangheem/ui/dialogs/change_password_dialog.dart';
import 'package:tangheem/ui/dialogs/otp_dialog.dart'; import 'package:tangheem/ui/dialogs/otp_dialog.dart';
import 'package:tangheem/widgets/common_textfield_widget.dart'; import 'package:tangheem/widgets/common_textfield_widget.dart';
import 'package:tangheem/extensions/string_extensions.dart';
class ForgotPasswordScreen extends StatefulWidget { class ForgotPasswordScreen extends StatefulWidget {
static const String routeName = "/forgot_password"; static const String routeName = "/forgot_password";
@ -23,6 +23,7 @@ class ForgotPasswordScreen extends StatefulWidget {
class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> { class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
TextEditingController _emailController = TextEditingController(); TextEditingController _emailController = TextEditingController();
GeneralResponseModel _generalResponse; GeneralResponseModel _generalResponse;
@override @override
void initState() { void initState() {
super.initState(); super.initState();

@ -6,11 +6,11 @@ import 'package:tangheem/app_state/app_state.dart';
import 'package:tangheem/classes/colors.dart'; import 'package:tangheem/classes/colors.dart';
import 'package:tangheem/classes/consts.dart'; import 'package:tangheem/classes/consts.dart';
import 'package:tangheem/classes/utils.dart'; import 'package:tangheem/classes/utils.dart';
import 'package:tangheem/extensions/string_extensions.dart';
import 'package:tangheem/models/authentication_user_model.dart'; import 'package:tangheem/models/authentication_user_model.dart';
import 'package:tangheem/ui/screens/forgot_password_screen.dart'; import 'package:tangheem/ui/screens/forgot_password_screen.dart';
import 'package:tangheem/ui/screens/registration_screen.dart'; import 'package:tangheem/ui/screens/registration_screen.dart';
import 'package:tangheem/widgets/common_textfield_widget.dart'; import 'package:tangheem/widgets/common_textfield_widget.dart';
import 'package:tangheem/extensions/string_extensions.dart';
class LoginScreen extends StatefulWidget { class LoginScreen extends StatefulWidget {
static const String routeName = "/login"; static const String routeName = "/login";

@ -10,6 +10,7 @@ import 'package:tangheem/ui/misc/no_data_ui.dart';
class MemberScreen extends StatefulWidget { class MemberScreen extends StatefulWidget {
static const String routeName = "/members"; static const String routeName = "/members";
MemberScreen({Key key}) : super(key: key); MemberScreen({Key key}) : super(key: key);
@override @override

@ -3,6 +3,7 @@ import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart';
class PdfViewerScreen extends StatefulWidget { class PdfViewerScreen extends StatefulWidget {
static const String routeName = "/tangheem_pdf"; static const String routeName = "/tangheem_pdf";
PdfViewerScreen({Key key}) : super(key: key); PdfViewerScreen({Key key}) : super(key: key);
@override @override
@ -13,6 +14,7 @@ class PdfViewerScreen extends StatefulWidget {
class _PdfViewerScreenState extends State<PdfViewerScreen> { class _PdfViewerScreenState extends State<PdfViewerScreen> {
final GlobalKey<SfPdfViewerState> _pdfViewerKey = GlobalKey(); final GlobalKey<SfPdfViewerState> _pdfViewerKey = GlobalKey();
@override @override
void initState() { void initState() {
super.initState(); super.initState();

@ -13,17 +13,15 @@ import 'package:tangheem/models/aya_model.dart';
import 'package:tangheem/models/aya_tangheem_type_mapped.dart'; import 'package:tangheem/models/aya_tangheem_type_mapped.dart';
import 'package:tangheem/models/bookmark_model.dart'; import 'package:tangheem/models/bookmark_model.dart';
import 'package:tangheem/models/surah_model.dart'; import 'package:tangheem/models/surah_model.dart';
import 'package:tangheem/widgets/auto_scroll_view/aya_scroll_view.dart';
import 'package:tangheem/widgets/auto_scroll_view/scroll_id.dart'; import 'package:tangheem/widgets/auto_scroll_view/scroll_id.dart';
import 'package:tangheem/widgets/aya_player_widget.dart';
import 'package:tangheem/widgets/common_dropdown_button.dart'; import 'package:tangheem/widgets/common_dropdown_button.dart';
import 'package:tangheem/widgets/text_highlight_widget.dart';
import 'tangheem_detail_screen.dart'; import 'tangheem_detail_screen.dart';
class QuranScreen extends StatefulWidget { class QuranScreen extends StatefulWidget {
static const String routeName = "/quran"; static const String routeName = "/quran";
final BookMarkModel bookmark; final BookMarkModel bookmark;
QuranScreen({Key key, this.bookmark}) : super(key: key); QuranScreen({Key key, this.bookmark}) : super(key: key);
@override @override
@ -65,6 +63,7 @@ class _QuranScreenState extends State<QuranScreen> {
double fontSize = 18; double fontSize = 18;
SharedPreferences prefs; SharedPreferences prefs;
void getPrefs() async { void getPrefs() async {
prefs = await SharedPreferences.getInstance(); prefs = await SharedPreferences.getInstance();
fontSize = (prefs.getInt(GlobalConsts.fontZoomSize) ?? 18) + 0.0; fontSize = (prefs.getInt(GlobalConsts.fontZoomSize) ?? 18) + 0.0;
@ -95,6 +94,7 @@ class _QuranScreenState extends State<QuranScreen> {
} }
List<BookMarkModel> _bookMark = []; List<BookMarkModel> _bookMark = [];
void getBookMark() async { void getBookMark() async {
_bookMark = await BookMarkModel.getFromPrefs(); _bookMark = await BookMarkModel.getFromPrefs();
if (_bookMark.length == 1) { if (_bookMark.length == 1) {
@ -107,6 +107,7 @@ class _QuranScreenState extends State<QuranScreen> {
int numberOfAyah = 0; int numberOfAyah = 0;
var filteredAyahList = []; var filteredAyahList = [];
void filterData() { void filterData() {
numberOfAyah = _surahModel?.data[_selectedSurah]?.numberOfAyahs ?? 0; numberOfAyah = _surahModel?.data[_selectedSurah]?.numberOfAyahs ?? 0;
filteredAyahList = List.generate(getNextMultiple(numberOfAyah), (index) => index + 1).toList().where((element) => element == 1 || (element % 5) == 0).toList() ?? []; filteredAyahList = List.generate(getNextMultiple(numberOfAyah), (index) => index + 1).toList().where((element) => element == 1 || (element % 5) == 0).toList() ?? [];

@ -4,10 +4,10 @@ import 'package:flutter_svg/svg.dart';
import 'package:tangheem/api/user_api_client.dart'; import 'package:tangheem/api/user_api_client.dart';
import 'package:tangheem/classes/colors.dart'; import 'package:tangheem/classes/colors.dart';
import 'package:tangheem/classes/utils.dart'; import 'package:tangheem/classes/utils.dart';
import 'package:tangheem/extensions/string_extensions.dart';
import 'package:tangheem/models/country_model.dart'; import 'package:tangheem/models/country_model.dart';
import 'package:tangheem/ui/bottom_sheets/country_selection_bottom_sheet.dart'; import 'package:tangheem/ui/bottom_sheets/country_selection_bottom_sheet.dart';
import 'package:tangheem/widgets/common_textfield_widget.dart'; import 'package:tangheem/widgets/common_textfield_widget.dart';
import 'package:tangheem/extensions/string_extensions.dart';
class RegistrationScreen extends StatefulWidget { class RegistrationScreen extends StatefulWidget {
static const String routeName = "/registration"; static const String routeName = "/registration";

@ -8,18 +8,20 @@ import 'package:tangheem/app_state/app_state.dart';
import 'package:tangheem/classes/colors.dart'; import 'package:tangheem/classes/colors.dart';
import 'package:tangheem/classes/consts.dart'; import 'package:tangheem/classes/consts.dart';
import 'package:tangheem/classes/utils.dart'; import 'package:tangheem/classes/utils.dart';
import 'package:tangheem/extensions/string_extensions.dart';
import 'package:tangheem/models/aya_tangheem_type_mapped.dart'; import 'package:tangheem/models/aya_tangheem_type_mapped.dart';
import 'package:tangheem/models/discussion_model.dart'; import 'package:tangheem/models/discussion_model.dart';
import 'package:tangheem/ui/dialogs/discussion_input_dialog.dart'; import 'package:tangheem/ui/dialogs/discussion_input_dialog.dart';
import 'package:tangheem/widgets/aya_player_widget.dart'; import 'package:tangheem/widgets/aya_player_widget.dart';
import 'package:tangheem/widgets/aya_record_widget.dart'; import 'package:tangheem/widgets/aya_record_widget.dart';
import 'package:tangheem/widgets/text_highlight_widget.dart'; import 'package:tangheem/widgets/text_highlight_widget.dart';
import 'package:tangheem/extensions/string_extensions.dart';
import 'login_screen.dart'; import 'login_screen.dart';
class TangheemDetailScreen extends StatefulWidget { class TangheemDetailScreen extends StatefulWidget {
static const String routeName = "/tangheem_detail"; static const String routeName = "/tangheem_detail";
final List<AyatTangheemTypeMappedData> ayatTangheemTypeMappedDataList; final List<AyatTangheemTypeMappedData> ayatTangheemTypeMappedDataList;
// final AyatTangheemTypeMappedData ayatTangheemTypeMappedData; // final AyatTangheemTypeMappedData ayatTangheemTypeMappedData;
TangheemDetailScreen({Key key, this.ayatTangheemTypeMappedDataList}) : super(key: key); TangheemDetailScreen({Key key, this.ayatTangheemTypeMappedDataList}) : super(key: key);
@ -54,6 +56,7 @@ class _TangheemDetailScreenState extends State<TangheemDetailScreen> {
double fontSize = 18; double fontSize = 18;
SharedPreferences prefs; SharedPreferences prefs;
void getPrefs() async { void getPrefs() async {
prefs = await SharedPreferences.getInstance(); prefs = await SharedPreferences.getInstance();
fontSize = (prefs.getInt(GlobalConsts.fontZoomSize) ?? 18) + 0.0; fontSize = (prefs.getInt(GlobalConsts.fontZoomSize) ?? 18) + 0.0;

@ -7,7 +7,6 @@ import 'package:tangheem/models/aya_tangheem_type_mapped.dart';
import 'package:tangheem/models/surah_model.dart'; import 'package:tangheem/models/surah_model.dart';
import 'package:tangheem/ui/misc/no_data_ui.dart'; import 'package:tangheem/ui/misc/no_data_ui.dart';
import 'package:tangheem/ui/screens/tangheem_detail_screen.dart'; import 'package:tangheem/ui/screens/tangheem_detail_screen.dart';
import 'package:tangheem/widgets/aya_record_widget.dart';
import 'package:tangheem/widgets/text_highlight_widget.dart'; import 'package:tangheem/widgets/text_highlight_widget.dart';
class TangheemScreen extends StatefulWidget { class TangheemScreen extends StatefulWidget {
@ -15,6 +14,7 @@ class TangheemScreen extends StatefulWidget {
final String tangheemQuery; final String tangheemQuery;
final String tangheemTypeName; final String tangheemTypeName;
final SurahModelData surah; final SurahModelData surah;
TangheemScreen({Key key, this.surah, this.tangheemQuery, this.tangheemTypeName}) : super(key: key); TangheemScreen({Key key, this.surah, this.tangheemQuery, this.tangheemTypeName}) : super(key: key);
@override @override

@ -3,6 +3,7 @@ import 'dart:io';
import 'dart:math' as math; import 'dart:math' as math;
import 'dart:typed_data'; import 'dart:typed_data';
import 'dart:ui' as ui; import 'dart:ui' as ui;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@ -21,6 +22,7 @@ class AyaPlayerWidget extends StatefulWidget {
final String surahName; final String surahName;
final GlobalKey globalKey; final GlobalKey globalKey;
final List<VoiceNote> voiceNoteList; final List<VoiceNote> voiceNoteList;
AyaPlayerWidget({Key key, this.surahName, this.voiceNoteList, @required this.globalKey}) : super(key: key); AyaPlayerWidget({Key key, this.surahName, this.voiceNoteList, @required this.globalKey}) : super(key: key);
@override @override

@ -1,4 +1,3 @@
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:tangheem/classes/colors.dart'; import 'package:tangheem/classes/colors.dart';

@ -1,4 +1,5 @@
import 'dart:math'; import 'dart:math';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:tangheem/classes/colors.dart'; import 'package:tangheem/classes/colors.dart';

Loading…
Cancel
Save