change colors and lottie

This commit is contained in:
MhdZiadHirati 2023-10-18 16:38:53 +03:00
parent 4d70dd5f32
commit f4f07fd71f
17 changed files with 35 additions and 36 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 533 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 927 B

View File

@ -1,3 +1,5 @@
// ignore_for_file: invalid_use_of_protected_member
import 'dart:io'; import 'dart:io';
import 'package:audio_waveforms/audio_waveforms.dart'; import 'package:audio_waveforms/audio_waveforms.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -49,26 +51,22 @@ class NewVoiceMessage extends StatelessWidget {
onDismissed: null, onDismissed: null,
child: SizedBox( child: SizedBox(
width: Get.width * 0.6, width: Get.width * 0.6,
height: 90, height: 70,
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius: BorderRadius.circular(10),
(messageModel.direction == MessageDirection.received) color: (messageModel.direction == MessageDirection.received)
? BorderRadius.circular(10) ? Colors.white
: null, : AppColors.sentMessageColor,
color: (messageModel.direction == MessageDirection.received) // image: (messageModel.direction == MessageDirection.sent)
? Colors.white // ? const DecorationImage(
: null, // image: AssetImage('assets/images/sent message.png'),
image: (messageModel.direction == MessageDirection.sent) // fit: BoxFit.fill)
? const DecorationImage( // : null
image: AssetImage('assets/images/sent message.png'), ),
fit: BoxFit.fill)
: null),
child: SizedBox( child: SizedBox(
width: Get.width, width: Get.width,
height: (messageModel.direction == MessageDirection.received) height: 70,
? 100
: null,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
(messageModel.direction == MessageDirection.received) (messageModel.direction == MessageDirection.received)
@ -99,7 +97,7 @@ class NewVoiceMessage extends StatelessWidget {
: AppColors.borderColor, : AppColors.borderColor,
), ),
), ),
).paddingOnly(left: 16, top: 16), ).paddingOnly(left: 16, top: 0),
); );
}), }),
Obx(() { Obx(() {
@ -142,7 +140,7 @@ class NewVoiceMessage extends StatelessWidget {
chatController.updateIsLoading( chatController.updateIsLoading(
messageModel.content, false); messageModel.content, false);
}), }),
).paddingOnly(left: 16, top: 16), ).paddingOnly(left: 16, top: 0),
); );
}), }),
Obx(() { Obx(() {
@ -168,7 +166,7 @@ class NewVoiceMessage extends StatelessWidget {
await playerController.pausePlayer(); await playerController.pausePlayer();
}), }),
).paddingOnly(left: 16, top: 16), ).paddingOnly(left: 16, top: 0),
); );
}), }),
Obx(() { Obx(() {
@ -301,12 +299,11 @@ class NewVoiceMessage extends StatelessWidget {
? 8 ? 8
: 0, : 0,
), ),
if (messageModel.direction == MessageDirection.sent)
const SizedBox(
height: 16,
),
], ],
), ).paddingOnly(
top: (messageModel.direction == MessageDirection.sent)
? 8
: 0),
).align( ).align(
alignment: (messageModel.direction == MessageDirection.received) alignment: (messageModel.direction == MessageDirection.received)
? Alignment.centerLeft ? Alignment.centerLeft

View File

@ -1,3 +1,5 @@
import 'dart:developer';
import 'package:taafee_mobile/core/apis/apis.dart'; import 'package:taafee_mobile/core/apis/apis.dart';
import 'package:taafee_mobile/core/network/http.dart'; import 'package:taafee_mobile/core/network/http.dart';
import '../model/params.dart'; import '../model/params.dart';
@ -8,7 +10,7 @@ class SplashSource {
Request(EndPoint.params, RequestMethod.get, cacheable: true); Request(EndPoint.params, RequestMethod.get, cacheable: true);
var response = var response =
await request.sendRequest(onConnectionError: onConnectionError); await request.sendRequest(onConnectionError: onConnectionError);
print('my response $response'); log('my response $response');
return Params.fromJson(response['data']); return Params.fromJson(response['data']);
} }
} }

View File

@ -7,17 +7,18 @@ import 'package:open_store/open_store.dart';
import 'package:taafee_mobile/common/extensions/widget_extension.dart'; import 'package:taafee_mobile/common/extensions/widget_extension.dart';
import 'package:taafee_mobile/core/local_storage/local_storage.dart'; import 'package:taafee_mobile/core/local_storage/local_storage.dart';
import 'package:taafee_mobile/core/routing/routing_manager.dart'; import 'package:taafee_mobile/core/routing/routing_manager.dart';
import 'package:taafee_mobile/core/url%20launcher/url_launcher_service.dart'; // import 'package:taafee_mobile/core/url%20launcher/url_launcher_service.dart';
import 'package:taafee_mobile/features/auth/business_logic_layer/auth_controller.dart'; import 'package:taafee_mobile/features/auth/business_logic_layer/auth_controller.dart';
import 'package:taafee_mobile/features/auth/presentation_layer/widgets/tail_auth.dart'; // import 'package:taafee_mobile/features/auth/presentation_layer/widgets/tail_auth.dart';
import 'package:taafee_mobile/features/home/business_logic_layer/home_controller.dart'; import 'package:taafee_mobile/features/home/business_logic_layer/home_controller.dart';
import 'package:taafee_mobile/features/splash/business_logic_layer/splash_controller.dart'; import 'package:taafee_mobile/features/splash/business_logic_layer/splash_controller.dart';
import 'package:url_launcher/url_launcher.dart'; // import 'package:url_launcher/url_launcher.dart';
import '../../../../common/const/const.dart'; import '../../../../common/const/const.dart';
import '../../../../common/widgets/text.dart'; import '../../../../common/widgets/text.dart';
import '../../../../common/widgets/toast.dart'; import '../../../../common/widgets/toast.dart';
import '../../../auth/data_layer/model/user.dart'; import '../../../auth/data_layer/model/user.dart';
import '../../../auth/presentation_layer/widgets/tail_auth.dart';
class SplashScreen extends StatelessWidget { class SplashScreen extends StatelessWidget {
SplashScreen({super.key}); SplashScreen({super.key});
@ -60,9 +61,8 @@ class SplashScreen extends StatelessWidget {
children: [ children: [
Container().expanded(2), Container().expanded(2),
SvgPicture.asset('assets/icons/tafee icon.svg'), SvgPicture.asset('assets/icons/tafee icon.svg'),
// Image.asset("assets/images/logo.png").expanded(4),
Container().expanded(2), Container().expanded(2),
// const TailAuth().expanded(2), const TailAuth().expanded(4),
], ],
), ),
Center( Center(