Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import 'package:trufi_core/base/pages/home/home.dart';
import 'package:trufi_core/base/pages/saved_places/saved_places.dart';
import 'package:trufi_core/base/pages/transport_list/transport_list.dart';
import 'package:trufi_core/base/widgets/alerts/error_base_alert.dart';
import 'package:uni_links/uni_links.dart';
import 'package:app_links/app_links.dart';

import 'exception_parse.dart';
import 'geo_location.dart';
Expand Down Expand Up @@ -41,7 +41,7 @@ class UniLinkProvider {
if (!_isUsedInitialUri) {
_isUsedInitialUri = true;
try {
final initialURI = await getInitialUri();
final initialURI = await AppLinks().getInitialLink();
if (initialURI != null) {
_parseUniLink(context: context, uri: initialURI);
}
Expand All @@ -55,7 +55,7 @@ class UniLinkProvider {
required BuildContext context,
}) {
if (!kIsWeb && !_isRegisteredListening) {
_streamSubscription = uriLinkStream.listen((Uri? uri) {
_streamSubscription = AppLinks().uriLinkStream.listen((Uri? uri) {
_parseUniLink(context: context, uri: uri);
}, onError: (e) {
debugPrint(e.toString());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class ItinerarySummaryAdvanced extends StatelessWidget {
maxWidth: newMaxWidth,
leg: leg,
legLength: legLength,
forcedColor: isPrimary ? Colors.green : null,
// forcedColor: isPrimary ? Colors.green : null,
));
isPrimary = !isPrimary;
} else if (leg.transportMode == TransportMode.bicycle && renderBar) {
Expand All @@ -101,7 +101,7 @@ class ItinerarySummaryAdvanced extends StatelessWidget {
maxWidth: newMaxWidth,
leg: leg,
legLength: legLength,
forcedColor: isPrimary ? Colors.green : null,
// forcedColor: isPrimary ? Colors.green : null,
));
isPrimary = !isPrimary;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class _ItineraryDetailsCardState extends State<ItineraryDetailsCard> {
_scrolling(index);
}
},
forcedColor: isPrimary ? null : Colors.green,
// forcedColor: isPrimary ? null : Colors.green,
);
})
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class RouteMapManagerCubit extends Cubit<RouteMapManagerState> {
Color textColor = isSelected ? leg.primaryColor : Colors.white;

if (isSelected && leg.transitLeg && isPrimary) {
color = Colors.green;
// color = Colors.green;
isPrimary = !isPrimary;
} else if (isSelected && leg.transitLeg) {
isPrimary = !isPrimary;
Expand Down
12 changes: 9 additions & 3 deletions lib/base/utils/util_icons/custom_icons.dart
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,17 @@ Widget carpoolIcon({Color? color}) {
}

String decodeFillColor(Color? color) {
// Default color is black
String stringColor = '#000000';
if (color != null) {
stringColor = color == Colors.transparent
? 'none'
: "#${color.value.toRadixString(16)}";
if (color == Colors.transparent) {
stringColor = 'none';
} else {
// Extract ARGB components
int value = color.value;
// Format to #RRGGBB (skip alpha value)
stringColor = '#${(value & 0xFFFFFF).toRadixString(16).padLeft(6, '0')}';
}
}
return stringColor;
}
64 changes: 40 additions & 24 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,38 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.0.4"
app_links:
dependency: "direct main"
description:
name: app_links
sha256: ad1a6d598e7e39b46a34f746f9a8b011ee147e4c275d407fa457e7a62f84dd99
url: "https://pub.dev"
source: hosted
version: "6.3.2"
app_links_linux:
dependency: transitive
description:
name: app_links_linux
sha256: f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81
url: "https://pub.dev"
source: hosted
version: "1.0.3"
app_links_platform_interface:
dependency: transitive
description:
name: app_links_platform_interface
sha256: "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f"
url: "https://pub.dev"
source: hosted
version: "2.0.2"
app_links_web:
dependency: transitive
description:
name: app_links_web
sha256: af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555
url: "https://pub.dev"
source: hosted
version: "1.0.4"
args:
dependency: transitive
description:
Expand Down Expand Up @@ -389,6 +421,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "5.2.0-beta.9"
gtk:
dependency: transitive
description:
name: gtk
sha256: e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c
url: "https://pub.dev"
source: hosted
version: "2.1.0"
hive:
dependency: "direct main"
description:
Expand Down Expand Up @@ -810,30 +850,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.3.2"
uni_links:
dependency: "direct main"
description:
name: uni_links
sha256: "051098acfc9e26a9fde03b487bef5d3d228ca8f67693480c6f33fd4fbb8e2b6e"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
uni_links_platform_interface:
dependency: transitive
description:
name: uni_links_platform_interface
sha256: "929cf1a71b59e3b7c2d8a2605a9cf7e0b125b13bc858e55083d88c62722d4507"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
uni_links_web:
dependency: transitive
description:
name: uni_links_web
sha256: "7539db908e25f67de2438e33cc1020b30ab94e66720b5677ba6763b25f6394df"
url: "https://pub.dev"
source: hosted
version: "0.1.0"
unicode:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies:
rxdart: ^0.28.0
share_plus: ^10.0.2
synchronized: ^3.2.0
uni_links: ^0.5.1
app_links: ^6.3.2
uuid: ^4.5.1
url_launcher: ^6.3.0
bloc: ^8.1.4
Expand Down
Loading