Skip to content

Commit

Permalink
Change marquee to singlescrollview (#998)
Browse files Browse the repository at this point in the history
* Change marquee to singlescrollview

* Remove marquee in pubspec
  • Loading branch information
XavierPaquet-Rapold authored Jul 5, 2024
1 parent c199ad7 commit 6e1cd45
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 81 deletions.
37 changes: 5 additions & 32 deletions lib/features/student/grades/widgets/grade_evaluation_tile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ import 'dart:math';
import 'package:flutter/material.dart';

// Package imports:
import 'package:auto_size_text/auto_size_text.dart';
import 'package:ets_api_clients/models.dart';
import 'package:feature_discovery/feature_discovery.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:intl/intl.dart';
import 'package:marquee/marquee.dart';

// Project imports:
import 'package:notredame/features/welcome/discovery/models/discovery_ids.dart';
Expand Down Expand Up @@ -115,45 +113,20 @@ class _GradeEvaluationTileState extends State<GradeEvaluationTile>
title: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
if (!showEvaluationDetails)
Padding(
padding: const EdgeInsets.only(top: 30.0),
Padding(
padding: const EdgeInsets.only(top: 30.0),
child: SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Text(
widget.evaluation.title,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 16,
color: Utils.getColorByBrightness(
context, Colors.black, Colors.white),
),
),
)
else
SizedBox(
child: Padding(
padding: const EdgeInsets.only(top: 30.0),
child: AutoSizeText(
widget.evaluation.title,
style: TextStyle(
fontSize: 16,
color: Utils.getColorByBrightness(
context, Colors.black, Colors.white),
),
maxLines: 1,
minFontSize: 16,
overflowReplacement: Marquee(
text: widget.evaluation.title,
velocity: 15,
blankSpace: 50,
style: TextStyle(
fontSize: 16,
color: Utils.getColorByBrightness(
context, Colors.black, Colors.white),
),
),
),
),
),
),
Padding(
padding: const EdgeInsets.only(top: 10.0, bottom: 20.0),
child: Text(
Expand Down
80 changes: 32 additions & 48 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ packages:
dependency: transitive
description:
name: archive
sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
url: "https://pub.dev"
source: hosted
version: "3.5.1"
version: "3.6.1"
args:
dependency: transitive
description:
Expand Down Expand Up @@ -306,14 +306,6 @@ packages:
url: "https://github.com/ApplETS/ETS-API-Clients.git"
source: git
version: "1.2.5"
fading_edge_scrollview:
dependency: transitive
description:
name: fading_edge_scrollview
sha256: c25c2231652ce774cc31824d0112f11f653881f43d7f5302c05af11942052031
url: "https://pub.dev"
source: hosted
version: "3.0.0"
fake_async:
dependency: transitive
description:
Expand Down Expand Up @@ -390,10 +382,10 @@ packages:
dependency: transitive
description:
name: firebase_core_platform_interface
sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63
sha256: "1003a5a03a61fc9a22ef49f37cbcb9e46c86313a7b2e7029b9390cf8c6fc32cb"
url: "https://pub.dev"
source: hosted
version: "5.0.0"
version: "5.1.0"
firebase_core_web:
dependency: transitive
description:
Expand Down Expand Up @@ -536,10 +528,10 @@ packages:
dependency: "direct main"
description:
name: flutter_markdown
sha256: "9921f9deda326f8a885e202b1e35237eadfc1345239a0f6f0f1ff287e047547f"
sha256: "85cc6f7daeae537844c92e2d56e2aff61b00095f8f77913b529ea4be12fc45ea"
url: "https://pub.dev"
source: hosted
version: "0.7.1"
version: "0.7.2+1"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
Expand All @@ -552,10 +544,10 @@ packages:
dependency: "direct main"
description:
name: flutter_secure_storage
sha256: c0f402067fb0498934faa6bddd670de0a3db45222e2ca9a068c6177c9a2360a4
sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0"
url: "https://pub.dev"
source: hosted
version: "9.1.1"
version: "9.2.2"
flutter_secure_storage_linux:
dependency: transitive
description:
Expand All @@ -568,18 +560,18 @@ packages:
dependency: transitive
description:
name: flutter_secure_storage_macos
sha256: "8cfa53010a294ff095d7be8fa5bb15f2252c50018d69c5104851303f3ff92510"
sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81"
url: "https://pub.dev"
source: hosted
version: "3.1.0"
version: "3.1.2"
flutter_secure_storage_platform_interface:
dependency: transitive
description:
name: flutter_secure_storage_platform_interface
sha256: "301f67ee9b87f04aef227f57f13f126fa7b13543c8e7a93f25c5d2d534c28a4a"
sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.1.2"
flutter_secure_storage_web:
dependency: transitive
description:
Expand Down Expand Up @@ -706,18 +698,18 @@ packages:
dependency: transitive
description:
name: google_maps_flutter_ios
sha256: e5132d17f051600d90d79d9f574b177c24231da702453a036db2490f9ced4646
sha256: d2d63ae17297a5b045ec115572c5a86fa4e53bb6eceaa0c6d200ac5ca69bfca4
url: "https://pub.dev"
source: hosted
version: "2.6.0"
version: "2.7.0"
google_maps_flutter_platform_interface:
dependency: transitive
description:
name: google_maps_flutter_platform_interface
sha256: "167af879da4d004cd58771f1469b91dcc3b9b0a2c5334cc6bf71fd41d4b35403"
sha256: "2bf21aa97edba4461282af5de693b354e589d09f695f7a6f80437d084a29687e"
url: "https://pub.dev"
source: hosted
version: "2.6.0"
version: "2.7.1"
google_maps_flutter_web:
dependency: transitive
description:
Expand Down Expand Up @@ -778,10 +770,10 @@ packages:
dependency: transitive
description:
name: image
sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e"
sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
url: "https://pub.dev"
source: hosted
version: "4.1.7"
version: "4.2.0"
import_sorter:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -910,14 +902,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "7.2.2"
marquee:
dependency: "direct main"
description:
name: marquee
sha256: "4b5243d2804373bdc25fc93d42c3b402d6ec1f4ee8d0bb72276edd04ae7addb8"
url: "https://pub.dev"
source: hosted
version: "2.2.3"
matcher:
dependency: transitive
description:
Expand Down Expand Up @@ -1082,10 +1066,10 @@ packages:
dependency: transitive
description:
name: platform
sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
url: "https://pub.dev"
source: hosted
version: "3.1.4"
version: "3.1.5"
plugin_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -1122,10 +1106,10 @@ packages:
dependency: transitive
description:
name: pubspec_parse
sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
url: "https://pub.dev"
source: hosted
version: "1.2.3"
version: "1.3.0"
reorderable_grid_view:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1487,18 +1471,18 @@ packages:
dependency: "direct main"
description:
name: url_launcher
sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
url: "https://pub.dev"
source: hosted
version: "6.2.6"
version: "6.3.0"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775"
sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
url: "https://pub.dev"
source: hosted
version: "6.3.1"
version: "6.3.2"
url_launcher_ios:
dependency: transitive
description:
Expand Down Expand Up @@ -1631,18 +1615,18 @@ packages:
dependency: "direct main"
description:
name: webview_flutter
sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932"
sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522"
url: "https://pub.dev"
source: hosted
version: "4.7.0"
version: "4.8.0"
webview_flutter_android:
dependency: transitive
description:
name: webview_flutter_android
sha256: dad3313c9ead95517bb1cae5e1c9d20ba83729d5a59e5e83c0a2d66203f27f91
sha256: "0d21cfc3bfdd2e30ab2ebeced66512b91134b39e72e97b43db2d47dda1c4e53a"
url: "https://pub.dev"
source: hosted
version: "3.16.1"
version: "3.16.3"
webview_flutter_platform_interface:
dependency: transitive
description:
Expand All @@ -1655,10 +1639,10 @@ packages:
dependency: transitive
description:
name: webview_flutter_wkwebview
sha256: f12f8d8a99784b863e8b85e4a9a5e3cf1839d6803d2c0c3e0533a8f3c5a992a7
sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0"
url: "https://pub.dev"
source: hosted
version: "3.13.0"
version: "3.13.1"
win32:
dependency: transitive
description:
Expand Down
1 change: 0 additions & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ dependencies:
device_info_plus: ^9.1.2
pub_semver: ^2.1.4
home_widget: ^0.4.1
marquee: ^2.2.3
auto_size_text: ^3.0.0
easter_egg_trigger: ^1.0.1
timeago: ^3.3.0
Expand Down

0 comments on commit 6e1cd45

Please sign in to comment.