diff --git a/lib/base/networking/apis/tumSexyApi/tum_sexy_api.dart b/lib/base/networking/apis/tumSexyApi/tum_sexy_api.dart deleted file mode 100644 index caad4dc8..00000000 --- a/lib/base/networking/apis/tumSexyApi/tum_sexy_api.dart +++ /dev/null @@ -1,18 +0,0 @@ -import 'package:campus_flutter/base/networking/protocols/api.dart'; - -class TumSexyApi extends Api { - @override - String get baseURL => "https://json.tum.sexy/"; - - @override - bool get needsAuth => false; - - @override - Map get parameters => {}; - - @override - String get path => ""; - - @override - String get paths => ""; -} diff --git a/lib/base/theme/dark_theme.dart b/lib/base/theme/dark_theme.dart index 1ce3cf97..b7ccd240 100644 --- a/lib/base/theme/dark_theme.dart +++ b/lib/base/theme/dark_theme.dart @@ -71,7 +71,7 @@ ThemeData darkTheme(BuildContext context) { cardTheme: CardTheme( color: const Color(0xff252525), surfaceTintColor: Colors.transparent, - elevation: 1.5, + elevation: 1, margin: EdgeInsets.symmetric( vertical: context.halfPadding, horizontal: context.padding, diff --git a/lib/base/theme/light_theme.dart b/lib/base/theme/light_theme.dart index 7ba71ce4..038d04ed 100644 --- a/lib/base/theme/light_theme.dart +++ b/lib/base/theme/light_theme.dart @@ -78,7 +78,7 @@ ThemeData lightTheme(BuildContext context) { cardTheme: CardTheme( color: Colors.white, surfaceTintColor: Colors.transparent, - elevation: 1.5, + elevation: 1, margin: EdgeInsets.symmetric( vertical: context.halfPadding, horizontal: context.padding, diff --git a/lib/gradeComponent/views/grade_rectangle.dart b/lib/gradeComponent/views/grade_rectangle.dart index 7f1c7a36..6aabdad3 100644 --- a/lib/gradeComponent/views/grade_rectangle.dart +++ b/lib/gradeComponent/views/grade_rectangle.dart @@ -26,8 +26,9 @@ class GradeRectangle extends StatelessWidget { : parsedGrade.toString(), style: Theme.of(context).textTheme.headlineSmall?.copyWith( color: Colors.white, + fontWeight: FontWeight.bold, shadows: [ - const Shadow(color: Colors.black, blurRadius: 10.0), + Shadow(color: Colors.grey.shade600, blurRadius: 3), ], ), ), diff --git a/lib/gradeComponent/views/grade_view.dart b/lib/gradeComponent/views/grade_view.dart index ce5917d3..874af2d0 100644 --- a/lib/gradeComponent/views/grade_view.dart +++ b/lib/gradeComponent/views/grade_view.dart @@ -20,6 +20,7 @@ class GradeRow extends StatelessWidget { subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ + const Padding(padding: EdgeInsets.symmetric(vertical: 2.0)), Row( children: [ Expanded( diff --git a/lib/lectureComponent/views/detailed_lecture_info_row_view.dart b/lib/lectureComponent/views/detailed_lecture_info_row_view.dart index f4e8569b..2522a571 100644 --- a/lib/lectureComponent/views/detailed_lecture_info_row_view.dart +++ b/lib/lectureComponent/views/detailed_lecture_info_row_view.dart @@ -25,7 +25,7 @@ class DetailedLectureInfoRowView extends StatelessWidget { .titleSmall ?.copyWith(fontWeight: FontWeight.bold), ), - Text(information.replaceAll(r'\\n', "\n")), + Text(information.replaceAll(r'\\n', "\n").replaceAll(r'\t', "\t")), ], ), ); diff --git a/lib/lectureComponent/views/lecture_view.dart b/lib/lectureComponent/views/lecture_view.dart index 64d1beb6..e8ad642d 100644 --- a/lib/lectureComponent/views/lecture_view.dart +++ b/lib/lectureComponent/views/lecture_view.dart @@ -19,6 +19,7 @@ class LectureView extends ConsumerWidget { subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ + const Padding(padding: EdgeInsets.symmetric(vertical: 2.0)), Row( children: [ Expanded( diff --git a/pubspec.lock b/pubspec.lock index 641b2904..9e68f5f5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -194,7 +194,7 @@ packages: source: hosted version: "4.8.0" collection: - dependency: transitive + dependency: "direct main" description: name: collection sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a @@ -293,18 +293,18 @@ packages: dependency: "direct main" description: name: dio_cache_interceptor - sha256: "7c0cb435963f08aa751ae8769b360d462f01160adc1d2d5b80e3b8c450b386e3" + sha256: fb7905c0d12075d8786a6b63bffd64ae062d053f682cfaf28d145a2686507308 url: "https://pub.dev" source: hosted - version: "3.4.4" + version: "3.5.0" dio_cache_interceptor_hive_store: dependency: "direct main" description: name: dio_cache_interceptor_hive_store - sha256: "7a376b1db0a153e16ad51ce0cf1d2549ca14a2ddf462523c362fac9e077c5f14" + sha256: "449b36541216cb20543228081125ad2995eb9712ec35bd030d85663ea1761895" url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" fake_async: dependency: transitive description: @@ -481,10 +481,10 @@ packages: dependency: transitive description: name: geolocator_android - sha256: "93906636752ea4d4e778afa981fdfe7409f545b3147046300df194330044d349" + sha256: "741579fa6c9e412984d2bdb2fbaa54e3c3f7587c60aeacfe6e058358a11f40f8" url: "https://pub.dev" source: hosted - version: "4.3.1" + version: "4.4.0" geolocator_apple: dependency: transitive description: @@ -562,7 +562,7 @@ packages: description: path: "packages/google_maps_flutter/google_maps_flutter_ios" ref: main - resolved-ref: "77a0e73437c91e2588c6da4ee2c1340e9b33376e" + resolved-ref: fcec7a077dd9bac1376485a9aa406f135d856dbd url: "https://github.com/jakobkoerber/packages.git" source: git version: "2.3.2" @@ -624,13 +624,13 @@ packages: source: hosted version: "0.15.4" http: - dependency: "direct main" + dependency: transitive description: name: http - sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 url: "https://pub.dev" source: hosted - version: "0.13.6" + version: "1.1.2" http2: dependency: transitive description: @@ -1132,6 +1132,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" sqflite: dependency: transitive description: @@ -1192,34 +1200,34 @@ packages: dependency: "direct main" description: name: syncfusion_flutter_calendar - sha256: c88c232857bfbf19b2c73faae9c6b3a8d50f5811222aa4ea0d08c25b07b44127 + sha256: "68b7555324f76badae05cd12c2e6d55020896ab041d8c7e07ca7762b3235e76c" url: "https://pub.dev" source: hosted - version: "23.2.5" + version: "23.2.6" syncfusion_flutter_charts: dependency: "direct main" description: name: syncfusion_flutter_charts - sha256: "08ee657ad7aa70b46cfe27e76610d06a5575a3b1aff9dcfd9243aded8b21baa3" + sha256: "92b707bb89c3db2920b3693e12577afec761720054670ccb12e0c69e29203ce7" url: "https://pub.dev" source: hosted - version: "23.2.5" + version: "23.2.6" syncfusion_flutter_core: dependency: transitive description: name: syncfusion_flutter_core - sha256: f88d7f241255f33001804735cca3cf0439936b76d1024cef3a9a4e361194bc29 + sha256: "88366a5e95ccb4091feb531021567f76ed3ceddab7424de02a9ac4a335d22a44" url: "https://pub.dev" source: hosted - version: "23.2.5" + version: "23.2.6" syncfusion_flutter_datepicker: dependency: "direct main" description: name: syncfusion_flutter_datepicker - sha256: "6c0e1ca5a76afe24b8f5a626965d11f9072b39430ee56cb1597aa211029f906f" + sha256: "5e0a9647232fbbd31d1734f4f8eba517e78a6ea955739671182c9c7cbdd05d42" url: "https://pub.dev" source: hosted - version: "23.2.5" + version: "23.2.6" synchronized: dependency: transitive description: @@ -1376,10 +1384,10 @@ packages: dependency: "direct main" description: name: uuid - sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + sha256: df5a4d8f22ee4ccd77f8839ac7cb274ebc11ef9adcce8b92be14b797fe889921 url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "4.2.1" vector_graphics: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index daf3e871..54b1bc02 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,7 +21,6 @@ dependencies: flutter_secure_storage: ^9.0.0 geolocator: ^10.0.1 hive: ^2.2.3 - http: ^0.13.6 intl: any json_annotation: ^4.8.0 json_serializable: ^6.6.1 @@ -51,7 +50,8 @@ dependencies: flutter_localizations: sdk: flutter flutter_svg: ^2.0.9 - uuid: ^3.0.7 + uuid: ^4.2.1 + collection: ^1.18.0 dependency_overrides: xml2json: