forked from firka/student-legacy
changed lots of thing bc pub upgrade
This commit is contained in:
parent
bc8eb1910e
commit
506fb82dd0
@ -55,7 +55,7 @@ class FilcAPI {
|
|||||||
static const stripeSheet = "$payment/stripe-sheet";
|
static const stripeSheet = "$payment/stripe-sheet";
|
||||||
|
|
||||||
static Future<bool> checkConnectivity() async =>
|
static Future<bool> checkConnectivity() async =>
|
||||||
(await Connectivity().checkConnectivity()) != ConnectivityResult.none;
|
(await Connectivity().checkConnectivity())[0] != ConnectivityResult.none;
|
||||||
|
|
||||||
static Future<List<School>?> getSchools() async {
|
static Future<List<School>?> getSchools() async {
|
||||||
try {
|
try {
|
||||||
|
@ -15,7 +15,7 @@ class StatusProvider extends ChangeNotifier {
|
|||||||
StatusProvider() {
|
StatusProvider() {
|
||||||
_handleNetworkChanges();
|
_handleNetworkChanges();
|
||||||
_handleDNSFailure();
|
_handleDNSFailure();
|
||||||
Connectivity().checkConnectivity().then((value) => _networkType = value);
|
Connectivity().checkConnectivity().then((value) => _networkType = value[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
Status? getStatus() => _stack.isNotEmpty ? _stack[0] : null;
|
Status? getStatus() => _stack.isNotEmpty ? _stack[0] : null;
|
||||||
@ -24,8 +24,8 @@ class StatusProvider extends ChangeNotifier {
|
|||||||
|
|
||||||
void _handleNetworkChanges() {
|
void _handleNetworkChanges() {
|
||||||
Connectivity().onConnectivityChanged.listen((event) {
|
Connectivity().onConnectivityChanged.listen((event) {
|
||||||
_networkType = event;
|
_networkType = event[0];
|
||||||
if (event == ConnectivityResult.none) {
|
if (event[0] == ConnectivityResult.none) {
|
||||||
if (!_stack.contains(Status.network)) {
|
if (!_stack.contains(Status.network)) {
|
||||||
_stack.remove(Status.apiError);
|
_stack.remove(Status.apiError);
|
||||||
_stack.insert(0, Status.network);
|
_stack.insert(0, Status.network);
|
||||||
|
@ -40,17 +40,17 @@ dependencies:
|
|||||||
path_provider: ^2.0.2
|
path_provider: ^2.0.2
|
||||||
permission_handler: ^11.0.1
|
permission_handler: ^11.0.1
|
||||||
share_plus: ^9.0.0
|
share_plus: ^9.0.0
|
||||||
connectivity_plus: ^5.0.2
|
connectivity_plus: ^6.0.3
|
||||||
flutter_displaymode: ^0.6.0
|
flutter_displaymode: ^0.6.0
|
||||||
quick_actions: ^1.0.1
|
quick_actions: ^1.0.1
|
||||||
animated_list_plus: ^0.5.0
|
animated_list_plus: ^0.5.0
|
||||||
dynamic_color: ^1.2.2
|
dynamic_color: ^1.2.2
|
||||||
material_color_utilities: ^0.8.0
|
material_color_utilities: ^0.8.0
|
||||||
crypto: ^3.0.2
|
crypto: ^3.0.2
|
||||||
elegant_notification: ^1.6.1
|
elegant_notification: ^2.2.0
|
||||||
flutter_feather_icons: ^2.0.0+1
|
flutter_feather_icons: ^2.0.0+1
|
||||||
live_activities: ^1.7.4
|
live_activities: ^1.7.4
|
||||||
animated_flip_counter: ^0.2.5
|
animated_flip_counter: ^0.3.4
|
||||||
lottie: ^3.1.0
|
lottie: ^3.1.0
|
||||||
rive: ^0.12.4
|
rive: ^0.12.4
|
||||||
animated_background: ^2.0.0
|
animated_background: ^2.0.0
|
||||||
|
@ -68,7 +68,7 @@ class LoginScreenState extends State<LoginScreen> {
|
|||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
style: const TextStyle(color: Colors.red),
|
style: const TextStyle(color: Colors.red),
|
||||||
),
|
),
|
||||||
onActionPressed: () {},
|
// onActionPressed: () {},
|
||||||
onCloseButtonPressed: () {},
|
onCloseButtonPressed: () {},
|
||||||
onDismiss: () {},
|
onDismiss: () {},
|
||||||
onProgressFinished: () {},
|
onProgressFinished: () {},
|
||||||
@ -340,7 +340,7 @@ class LoginScreenState extends State<LoginScreen> {
|
|||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
style: const TextStyle(color: Colors.black),
|
style: const TextStyle(color: Colors.black),
|
||||||
),
|
),
|
||||||
onActionPressed: () {},
|
// onActionPressed: () {},
|
||||||
onCloseButtonPressed: () {},
|
onCloseButtonPressed: () {},
|
||||||
onDismiss: () {},
|
onDismiss: () {},
|
||||||
onProgressFinished: () {},
|
onProgressFinished: () {},
|
||||||
|
@ -26,12 +26,12 @@ dependencies:
|
|||||||
provider: ^6.1.1
|
provider: ^6.1.1
|
||||||
url_launcher: ^6.2.5
|
url_launcher: ^6.2.5
|
||||||
flutter_linkify: ^6.0.0
|
flutter_linkify: ^6.0.0
|
||||||
flutter_markdown: ^0.6.20+1
|
flutter_markdown: ^0.7.2+1
|
||||||
animations: ^2.0.11
|
animations: ^2.0.11
|
||||||
confetti: ^0.7.0
|
confetti: ^0.7.0
|
||||||
auto_size_text: ^3.0.0
|
auto_size_text: ^3.0.0
|
||||||
flutter_acrylic: ^1.1.3
|
flutter_acrylic: ^1.1.3
|
||||||
elegant_notification: ^1.13.0
|
elegant_notification: ^2.2.0
|
||||||
flutter_staggered_grid_view: ^0.7.0
|
flutter_staggered_grid_view: ^0.7.0
|
||||||
i18n_extension: ^12.0.1
|
i18n_extension: ^12.0.1
|
||||||
flutter_expandable_fab: ^2.0.0
|
flutter_expandable_fab: ^2.0.0
|
||||||
@ -41,7 +41,7 @@ dependencies:
|
|||||||
flutter_custom_tabs: ^2.0.0+1
|
flutter_custom_tabs: ^2.0.0+1
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_lints: ^3.0.1
|
flutter_lints: ^4.0.0
|
||||||
|
|
||||||
flutter:
|
flutter:
|
||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
|
@ -11,10 +11,10 @@ dependencies:
|
|||||||
path: ../refilc/
|
path: ../refilc/
|
||||||
http: ^1.1.2
|
http: ^1.1.2
|
||||||
provider: ^6.1.1
|
provider: ^6.1.1
|
||||||
file_picker: ^6.1.1
|
file_picker: ^8.0.5
|
||||||
intl: ^0.19.0
|
intl: ^0.19.0
|
||||||
i18n_extension: ^12.0.1
|
i18n_extension: ^12.0.1
|
||||||
uuid: ^4.3.3
|
uuid: ^4.3.3
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_lints: ^3.0.1
|
flutter_lints: ^4.0.0
|
||||||
|
@ -49,7 +49,7 @@ class _FilterBarState extends State<FilterBar> {
|
|||||||
controller: widget.controller,
|
controller: widget.controller,
|
||||||
isScrollable: widget.scrollable,
|
isScrollable: widget.scrollable,
|
||||||
physics: const BouncingScrollPhysics(),
|
physics: const BouncingScrollPhysics(),
|
||||||
// Label
|
// label
|
||||||
labelStyle: Theme.of(context).textTheme.titleMedium!.copyWith(
|
labelStyle: Theme.of(context).textTheme.titleMedium!.copyWith(
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
fontSize: 15.0,
|
fontSize: 15.0,
|
||||||
@ -57,7 +57,7 @@ class _FilterBarState extends State<FilterBar> {
|
|||||||
labelPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 3),
|
labelPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 3),
|
||||||
labelColor: Theme.of(context).colorScheme.secondary,
|
labelColor: Theme.of(context).colorScheme.secondary,
|
||||||
unselectedLabelColor: AppColors.of(context).text.withOpacity(0.65),
|
unselectedLabelColor: AppColors.of(context).text.withOpacity(0.65),
|
||||||
// Indicator
|
// indicator
|
||||||
indicatorSize: TabBarIndicatorSize.tab,
|
indicatorSize: TabBarIndicatorSize.tab,
|
||||||
indicatorPadding: const EdgeInsets.symmetric(vertical: 8.0),
|
indicatorPadding: const EdgeInsets.symmetric(vertical: 8.0),
|
||||||
indicator: BoxDecoration(
|
indicator: BoxDecoration(
|
||||||
@ -65,7 +65,9 @@ class _FilterBarState extends State<FilterBar> {
|
|||||||
borderRadius: BorderRadius.circular(45.0),
|
borderRadius: BorderRadius.circular(45.0),
|
||||||
),
|
),
|
||||||
overlayColor: WidgetStateProperty.all(const Color(0x00000000)),
|
overlayColor: WidgetStateProperty.all(const Color(0x00000000)),
|
||||||
// Tabs
|
// underline (bottom border)
|
||||||
|
dividerColor: Colors.transparent,
|
||||||
|
// tabs
|
||||||
padding: EdgeInsets.zero,
|
padding: EdgeInsets.zero,
|
||||||
tabs: widget.censored
|
tabs: widget.censored
|
||||||
? censoredItemsWidth
|
? censoredItemsWidth
|
||||||
|
@ -217,7 +217,7 @@ class GradeGraphState extends State<GradeGraph> {
|
|||||||
height: 158,
|
height: 158,
|
||||||
child: subjectSpots.length > 1
|
child: subjectSpots.length > 1
|
||||||
? Padding(
|
? Padding(
|
||||||
padding: const EdgeInsets.only(top: 8.0, right: 8.0),
|
padding: const EdgeInsets.only(top: 6.0, right: 0.0),
|
||||||
child: LineChart(
|
child: LineChart(
|
||||||
LineChartData(
|
LineChartData(
|
||||||
extraLinesData: ExtraLinesData(
|
extraLinesData: ExtraLinesData(
|
||||||
@ -347,7 +347,7 @@ class GradeGraphState extends State<GradeGraph> {
|
|||||||
bottomTitles: AxisTitles(
|
bottomTitles: AxisTitles(
|
||||||
sideTitles: SideTitles(
|
sideTitles: SideTitles(
|
||||||
showTitles: true,
|
showTitles: true,
|
||||||
reservedSize: 24,
|
reservedSize: 25,
|
||||||
getTitlesWidget: (value, meta) {
|
getTitlesWidget: (value, meta) {
|
||||||
if (value == meta.max || value == meta.min) {
|
if (value == meta.max || value == meta.min) {
|
||||||
return Container();
|
return Container();
|
||||||
@ -362,9 +362,7 @@ class GradeGraphState extends State<GradeGraph> {
|
|||||||
title =
|
title =
|
||||||
title.substring(0, min(title.length, 4));
|
title.substring(0, min(title.length, 4));
|
||||||
|
|
||||||
return Padding(
|
return Text(
|
||||||
padding: const EdgeInsets.all(12.0),
|
|
||||||
child: Text(
|
|
||||||
title.toUpperCase(),
|
title.toUpperCase(),
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: AppColors.of(context)
|
color: AppColors.of(context)
|
||||||
@ -373,7 +371,6 @@ class GradeGraphState extends State<GradeGraph> {
|
|||||||
fontWeight: FontWeight.bold,
|
fontWeight: FontWeight.bold,
|
||||||
fontSize: 14.0,
|
fontSize: 14.0,
|
||||||
),
|
),
|
||||||
),
|
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
// getTextStyles: (context, value) => TextStyle(
|
// getTextStyles: (context, value) => TextStyle(
|
||||||
@ -425,14 +422,16 @@ class GradeGraphState extends State<GradeGraph> {
|
|||||||
sideTitles: SideTitles(
|
sideTitles: SideTitles(
|
||||||
showTitles: true,
|
showTitles: true,
|
||||||
interval: 1.0,
|
interval: 1.0,
|
||||||
|
reservedSize: 26.0,
|
||||||
getTitlesWidget: (value, meta) => Padding(
|
getTitlesWidget: (value, meta) => Padding(
|
||||||
padding: const EdgeInsets.all(16.0),
|
padding: const EdgeInsets.only(
|
||||||
|
left: 6.0, right: 10.0),
|
||||||
child: Text(
|
child: Text(
|
||||||
value.toInt().toString(),
|
value.toInt().toString(),
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: AppColors.of(context).text,
|
color: AppColors.of(context).text,
|
||||||
fontWeight: FontWeight.bold,
|
fontWeight: FontWeight.bold,
|
||||||
fontSize: 18.0,
|
fontSize: 16.0,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
@ -24,15 +24,15 @@ dependencies:
|
|||||||
fl_chart: ^0.68.0
|
fl_chart: ^0.68.0
|
||||||
url_launcher: ^6.2.5
|
url_launcher: ^6.2.5
|
||||||
flutter_material_color_picker: ^1.1.0+2
|
flutter_material_color_picker: ^1.1.0+2
|
||||||
photo_view: ^0.14.0
|
photo_view: ^0.15.0
|
||||||
flutter_linkify: ^6.0.0
|
flutter_linkify: ^6.0.0
|
||||||
flutter_custom_tabs: ^2.0.0+1
|
flutter_custom_tabs: ^2.0.0+1
|
||||||
flutter_markdown: ^0.6.23
|
flutter_markdown: ^0.7.2+1
|
||||||
animations: ^2.0.11
|
animations: ^2.0.11
|
||||||
animated_list_plus: ^0.5.0
|
animated_list_plus: ^0.5.0
|
||||||
confetti: ^0.7.0
|
confetti: ^0.7.0
|
||||||
live_activities: ^1.9.1+1
|
live_activities: ^1.9.1+1
|
||||||
animated_flip_counter: ^0.2.5
|
animated_flip_counter: ^0.3.4
|
||||||
lottie: ^3.1.0
|
lottie: ^3.1.0
|
||||||
rive: ^0.12.4
|
rive: ^0.12.4
|
||||||
animated_background: ^2.0.0
|
animated_background: ^2.0.0
|
||||||
@ -48,12 +48,12 @@ dependencies:
|
|||||||
rounded_expansion_tile:
|
rounded_expansion_tile:
|
||||||
git:
|
git:
|
||||||
url: https://github.com/kimaah/rounded_expansion_tile.git
|
url: https://github.com/kimaah/rounded_expansion_tile.git
|
||||||
go_router: ^13.2.0
|
go_router: ^14.2.0
|
||||||
flutter_expandable_fab: ^2.0.0
|
flutter_expandable_fab: ^2.0.0
|
||||||
intl: ^0.19.0
|
intl: ^0.19.0
|
||||||
i18n_extension: ^12.0.1
|
i18n_extension: ^12.0.1
|
||||||
auto_size_text: ^3.0.0
|
auto_size_text: ^3.0.0
|
||||||
connectivity_plus: ^5.0.2
|
connectivity_plus: ^6.0.3
|
||||||
collection: ^1.18.0
|
collection: ^1.18.0
|
||||||
share_plus: ^9.0.0
|
share_plus: ^9.0.0
|
||||||
image_picker: ^1.0.7
|
image_picker: ^1.0.7
|
||||||
@ -72,10 +72,10 @@ dependencies:
|
|||||||
carousel_slider: ^4.2.1
|
carousel_slider: ^4.2.1
|
||||||
flutter_portal: ^1.1.4
|
flutter_portal: ^1.1.4
|
||||||
webview_flutter: ^4.8.0
|
webview_flutter: ^4.8.0
|
||||||
file_picker: ^6.2.1
|
file_picker: ^8.0.5
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_lints: ^3.0.1
|
flutter_lints: ^4.0.0
|
||||||
|
|
||||||
flutter:
|
flutter:
|
||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 8af545b5a39bfbfc25c5f2a383dcdfada018cd75
|
Subproject commit 515ad02f5ac9d9e35983b1652506238fd2839c4c
|
Loading…
x
Reference in New Issue
Block a user