chat structure issues.

merge-requests/70/head
Sikander Saleem 3 years ago
parent cd45330243
commit 8018120c6a

@ -40,6 +40,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
List<ChatUser> favUsersList = []; List<ChatUser> favUsersList = [];
int paginationVal = 0; int paginationVal = 0;
// todo: @aamir need to make a separate api client for chat, need to improve code structure.
Future<void> getUserAutoLoginToken(BuildContext cxt) async { Future<void> getUserAutoLoginToken(BuildContext cxt) async {
Response response = await ApiClient().postJsonForResponse( Response response = await ApiClient().postJsonForResponse(
"${ApiConsts.chatServerBaseApiUrl}user/externaluserlogin", "${ApiConsts.chatServerBaseApiUrl}user/externaluserlogin",

@ -1,7 +1,7 @@
class ApiConsts { class ApiConsts {
//static String baseUrl = "http://10.200.204.20:2801/"; // Local server //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
//static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
static String baseUrl = "https://hmgwebservices.com"; // Live server // static String baseUrl = "https://hmgwebservices.com"; // Live server
static String baseUrlServices = baseUrl + "/Services/"; // server static String baseUrlServices = baseUrl + "/Services/"; // server
// static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/"; static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";

@ -91,6 +91,8 @@ class _IncomingCallState extends State<IncomingCall> with SingleTickerProviderSt
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: const <Widget>[ children: const <Widget>[
// todo @aamir, need to use extension mehtods
Text( Text(
"Aamir Saleem Ahmad", "Aamir Saleem Ahmad",
style: TextStyle( style: TextStyle(

@ -3,7 +3,8 @@ import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:sizer/sizer.dart';
// todo: @aamir use extension methods, and use correct widgets.
class ChatBubble extends StatelessWidget { class ChatBubble extends StatelessWidget {
const ChatBubble( const ChatBubble(

@ -30,6 +30,8 @@ class ChatDetailScreen extends StatefulWidget {
State<ChatDetailScreen> createState() => _ChatDetailScreenState(); State<ChatDetailScreen> createState() => _ChatDetailScreenState();
} }
// todo: @aamir use extension methods, and use correct widgets.
class _ChatDetailScreenState extends State<ChatDetailScreen> { class _ChatDetailScreenState extends State<ChatDetailScreen> {
dynamic userDetails; dynamic userDetails;
late ChatProviderModel data; late ChatProviderModel data;
@ -194,6 +196,7 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
], ],
), ),
if (m.isFileSelected && m.sFileType == ".png" || m.sFileType == ".jpeg" || m.sFileType == ".jpg") if (m.isFileSelected && m.sFileType == ".png" || m.sFileType == ".jpeg" || m.sFileType == ".jpg")
// todo @aamir use correct code
Card( Card(
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
elevation: 0, elevation: 0,
@ -383,6 +386,8 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
}; };
CallDataModel incomingCallData = CallDataModel.fromJson(json); CallDataModel incomingCallData = CallDataModel.fromJson(json);
// todo @aamir, we are using namedPagedRoute, need to replace
await Navigator.push( await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(

Loading…
Cancel
Save