StageAndSuitcase/stage-and-suitcase-mih
1
0
Fork 0
forked from yaso_meth/mih-project
Code Pull Requests Activity

Merge pull request #216 from yaso-meth/BUG--Marque-and-env-fix

Browse Source 
BUG--Marque-and-env-fix
This commit is contained in:
yaso-meth
2025-06-26 09:48:16 +02:00
committed by GitHub
parent 5f58831e3d 4e1c5bc0b8
commit 9251dde16c
3 changed files with 63 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Frontend/lib/mih_config/mih_env.dart
View File

@@ -19,17 +19,27 @@ abstract class AppEnviroment {
switch (env) {
case Enviroment.dev:
{
//================= Android Dev Urls =================
// baseApiUrl = "http://10.0.2.2:8080";
// baseFileUrl = "http://10.0.2.2:9000";
// baseAiUrl = "http://10.0.2.2:11434";
// bannerAdUnitId = 'ca-app-pub-3940256099942544/9214589741';
//================= Web & iOS Dev Urls =================
baseApiUrl = "http://localhost:8080";
baseFileUrl = "http://localhost:9000";
baseAiUrl = "http://localhost:11434";
bannerAdUnitId = 'ca-app-pub-3940256099942544/2435281174';
break;
if (kIsWeb) {
//================= Web Dev Urls =================
baseApiUrl = "http://localhost:8080";
baseFileUrl = "http://localhost:9000";
baseAiUrl = "http://localhost:11434";
bannerAdUnitId = 'ca-app-pub-3940256099942544/2435281174';
break;
} else if (Platform.isAndroid) {
//================= Android Dev Urls =================
baseApiUrl = "http://10.0.2.2:8080";
baseFileUrl = "http://10.0.2.2:9000";
baseAiUrl = "http://10.0.2.2:11434";
bannerAdUnitId = 'ca-app-pub-3940256099942544/9214589741';
} else {
//================= Web & iOS Dev Urls =================
baseApiUrl = "http://localhost:8080";
baseFileUrl = "http://localhost:9000";
baseAiUrl = "http://localhost:11434";
bannerAdUnitId = 'ca-app-pub-3940256099942544/2435281174';
break;
}
}
case Enviroment.prod:
{

41
Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart
View File

@@ -49,20 +49,20 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
final String maintenanceMsg =
"\tHeads up! We're doing maintenance on Thur, 15 May 2025 at 10 PM (CAT). MIH may be unavailable briefly.";
void _startMarquee() async {
while (mounted) {
final double maxScroll = _scrollController.position.maxScrollExtent;
await Future.delayed(const Duration(milliseconds: 500));
await _scrollController.animateTo(
maxScroll,
duration: _marqueeController.duration!,
curve: Curves.linear,
);
await Future.delayed(const Duration(milliseconds: 500));
_scrollController.jumpTo(0);
await Future.delayed(const Duration(milliseconds: 500));
}
}
// void _startMarquee() async {
// while (mounted) {
// final double maxScroll = _scrollController.position.maxScrollExtent;
// await Future.delayed(const Duration(milliseconds: 500));
// await _scrollController.animateTo(
// maxScroll,
// duration: _marqueeController.duration!,
// curve: Curves.linear,
// );
// await Future.delayed(const Duration(milliseconds: 500));
// _scrollController.jumpTo(0);
// await Future.delayed(const Duration(milliseconds: 500));
// }
// }
List<Map<String, Widget>> setNewBusinessUserPackages() {
List<Map<String, Widget>> temp = [];
@@ -182,12 +182,13 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
businessPackagesMap = setBusinessPackages();
}
searchPackage();
_marqueeController = AnimationController(
vsync: this,
duration: const Duration(seconds: 12),
);
_scrollController = ScrollController();
WidgetsBinding.instance.addPostFrameCallback((_) => _startMarquee());
//Scrolling Banner message
// _marqueeController = AnimationController(
// vsync: this,
// duration: const Duration(seconds: 12),
// );
// _scrollController = ScrollController();
// WidgetsBinding.instance.addPostFrameCallback((_) => _startMarquee());
}
@override

41
Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart
View File

@@ -57,20 +57,20 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
final String maintenanceMsg =
"\tHeads up! We're doing maintenance on Thur, 15 May 2025 at 10 PM (CAT). MIH may be unavailable briefly.";
void _startMarquee() async {
while (mounted) {
final double maxScroll = _scrollController.position.maxScrollExtent;
await Future.delayed(const Duration(milliseconds: 500));
await _scrollController.animateTo(
maxScroll,
duration: _marqueeController.duration!,
curve: Curves.linear,
);
await Future.delayed(const Duration(milliseconds: 500));
_scrollController.jumpTo(0);
await Future.delayed(const Duration(milliseconds: 500));
}
}
// void _startMarquee() async {
// while (mounted) {
// final double maxScroll = _scrollController.position.maxScrollExtent;
// await Future.delayed(const Duration(milliseconds: 500));
// await _scrollController.animateTo(
// maxScroll,
// duration: _marqueeController.duration!,
// curve: Curves.linear,
// );
// await Future.delayed(const Duration(milliseconds: 500));
// _scrollController.jumpTo(0);
// await Future.delayed(const Duration(milliseconds: 500));
// }
// }
List<Map<String, Widget>> setNerUserPersonalPackage() {
List<Map<String, Widget>> temp = [];
@@ -224,12 +224,13 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
personalPackagesMap = setPersonalPackagesMap();
}
searchPackage();
_marqueeController = AnimationController(
vsync: this,
duration: const Duration(seconds: 12),
);
_scrollController = ScrollController();
WidgetsBinding.instance.addPostFrameCallback((_) => _startMarquee());
//Scrolling Banner message
// _marqueeController = AnimationController(
// vsync: this,
// duration: const Duration(seconds: 12),
// );
// _scrollController = ScrollController();
// WidgetsBinding.instance.addPostFrameCallback((_) => _startMarquee());
}
@override