diff --git a/mobile/.gitignore b/mobile/.gitignore index 79c113f..6911a8c 100644 --- a/mobile/.gitignore +++ b/mobile/.gitignore @@ -43,3 +43,4 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release +/android/app/.cxx diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index aa34c77..2bc068e 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -11,12 +11,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 + jvmTarget = '21' } defaultConfig { diff --git a/mobile/android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/gradle/wrapper/gradle-wrapper.properties index 7bb2df6..3e2a00a 100644 --- a/mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip \ No newline at end of file diff --git a/mobile/android/settings.gradle b/mobile/android/settings.gradle index b9e43bd..c749982 100644 --- a/mobile/android/settings.gradle +++ b/mobile/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.1.0" apply false - id "org.jetbrains.kotlin.android" version "1.8.22" apply false + id "com.android.application" version '8.7.3' apply false + id "org.jetbrains.kotlin.android" version "2.0.21" apply false } include ":app" diff --git a/mobile/google_fonts/Merriweather-Black.ttf b/mobile/google_fonts/Merriweather-Black.ttf new file mode 100644 index 0000000..50c3b33 Binary files /dev/null and b/mobile/google_fonts/Merriweather-Black.ttf differ diff --git a/mobile/google_fonts/Merriweather-BlackItalic.ttf b/mobile/google_fonts/Merriweather-BlackItalic.ttf new file mode 100644 index 0000000..4879aba Binary files /dev/null and b/mobile/google_fonts/Merriweather-BlackItalic.ttf differ diff --git a/mobile/google_fonts/Merriweather-Bold.ttf b/mobile/google_fonts/Merriweather-Bold.ttf new file mode 100644 index 0000000..3e10e02 Binary files /dev/null and b/mobile/google_fonts/Merriweather-Bold.ttf differ diff --git a/mobile/google_fonts/Merriweather-BoldItalic.ttf b/mobile/google_fonts/Merriweather-BoldItalic.ttf new file mode 100644 index 0000000..5b9d0ec Binary files /dev/null and b/mobile/google_fonts/Merriweather-BoldItalic.ttf differ diff --git a/mobile/google_fonts/Merriweather-Italic.ttf b/mobile/google_fonts/Merriweather-Italic.ttf new file mode 100644 index 0000000..8e9d03d Binary files /dev/null and b/mobile/google_fonts/Merriweather-Italic.ttf differ diff --git a/mobile/google_fonts/Merriweather-Light.ttf b/mobile/google_fonts/Merriweather-Light.ttf new file mode 100644 index 0000000..034ef03 Binary files /dev/null and b/mobile/google_fonts/Merriweather-Light.ttf differ diff --git a/mobile/google_fonts/Merriweather-LightItalic.ttf b/mobile/google_fonts/Merriweather-LightItalic.ttf new file mode 100644 index 0000000..4d19550 Binary files /dev/null and b/mobile/google_fonts/Merriweather-LightItalic.ttf differ diff --git a/mobile/google_fonts/Merriweather-Regular.ttf b/mobile/google_fonts/Merriweather-Regular.ttf new file mode 100644 index 0000000..3fecc77 Binary files /dev/null and b/mobile/google_fonts/Merriweather-Regular.ttf differ diff --git a/mobile/google_fonts/Tinos-Bold.ttf b/mobile/google_fonts/Tinos-Bold.ttf new file mode 100644 index 0000000..d6cbae0 Binary files /dev/null and b/mobile/google_fonts/Tinos-Bold.ttf differ diff --git a/mobile/google_fonts/Tinos-BoldItalic.ttf b/mobile/google_fonts/Tinos-BoldItalic.ttf new file mode 100644 index 0000000..085a859 Binary files /dev/null and b/mobile/google_fonts/Tinos-BoldItalic.ttf differ diff --git a/mobile/google_fonts/Tinos-Italic.ttf b/mobile/google_fonts/Tinos-Italic.ttf new file mode 100644 index 0000000..136f704 Binary files /dev/null and b/mobile/google_fonts/Tinos-Italic.ttf differ diff --git a/mobile/google_fonts/Tinos-Regular.ttf b/mobile/google_fonts/Tinos-Regular.ttf new file mode 100644 index 0000000..ac28a19 Binary files /dev/null and b/mobile/google_fonts/Tinos-Regular.ttf differ diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart index 2afe285..393a5ac 100644 --- a/mobile/lib/main.dart +++ b/mobile/lib/main.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:google_fonts/google_fonts.dart'; import 'package:mobile/pages/log_in_page.dart'; import 'package:mobile/repos/add_to_cart_state.dart'; import 'package:mobile/repos/cart.dart'; @@ -36,11 +37,8 @@ class MyApp extends StatelessWidget { colorScheme: ColorScheme.fromSeed( seedColor: const Color.fromARGB(255, 149, 92, 255)), scaffoldBackgroundColor: const Color(0xFFFAFAFF), - textTheme: const TextTheme( - headlineLarge: TextStyle(color: Color(0xFF000000), fontSize: 64), - bodyLarge: TextStyle(color: Color(0xFF000000), fontSize: 20), - bodyMedium: TextStyle(color: Color(0xFF000000), fontSize: 16), - ), + textTheme: + GoogleFonts.merriweatherTextTheme(Theme.of(context).textTheme), useMaterial3: true, ), home: const LogInPage(), diff --git a/mobile/lib/pages/all_receipts_page.dart b/mobile/lib/pages/all_receipts_page.dart index 3e5ce57..3394fcd 100644 --- a/mobile/lib/pages/all_receipts_page.dart +++ b/mobile/lib/pages/all_receipts_page.dart @@ -44,7 +44,7 @@ class AllReceiptsPage extends StatelessWidget { children: [ Expanded(child: Consumer( builder: (_, receiptRepo, __) { - final allReceipts = receiptRepo.allReceipts(); + final allReceipts = receiptRepo.sortedReceiptsByDate(); return ListView.builder( shrinkWrap: true, itemBuilder: (_, idx) { diff --git a/mobile/lib/pages/home_page.dart b/mobile/lib/pages/home_page.dart index 3672d58..fa2bd9c 100644 --- a/mobile/lib/pages/home_page.dart +++ b/mobile/lib/pages/home_page.dart @@ -22,7 +22,10 @@ class HomePage extends StatelessWidget { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Text("Velkommen ${user.name}"), + Text( + "Velkommen ${user.name}", + style: Theme.of(context).textTheme.headlineMedium, + ), ], ), ), diff --git a/mobile/lib/repos/receipt.dart b/mobile/lib/repos/receipt.dart index bd7dcde..3825573 100644 --- a/mobile/lib/repos/receipt.dart +++ b/mobile/lib/repos/receipt.dart @@ -49,6 +49,15 @@ class ReceiptRepo extends ChangeNotifier { return receipts; } + List sortedReceiptsByDate() { + List clonedReceipts = []; + for (var i = 0; i < receipts.length; i++) { + clonedReceipts.add(receipts[i]); + } + clonedReceipts.sort((a, b) => b.date.compareTo(a.date)); + return clonedReceipts; + } + Receipt? receiptWithId(int id) { for (var i = 0; i < receipts.length; i++) { if (receipts[i].id == id) { diff --git a/mobile/macos/Flutter/GeneratedPluginRegistrant.swift b/mobile/macos/Flutter/GeneratedPluginRegistrant.swift index cccf817..e777c67 100644 --- a/mobile/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/mobile/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,6 +5,8 @@ import FlutterMacOS import Foundation +import path_provider_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index 7d92c7e..894da4a 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -5,50 +5,58 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" barcode_scan2: dependency: "direct main" description: name: barcode_scan2 - sha256: ee34fad7148248f4450652909f5188ad95c9b6f512e75088e96bc3e96ff2e9eb + sha256: efbe38629e6df2200e4d60ebe252e8e041cd5ae7b50f194a20f01779ade9d1c3 url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" + crypto: + dependency: transitive + description: + name: crypto + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + url: "https://pub.dev" + source: hosted + version: "3.0.6" cupertino_icons: dependency: "direct main" description: @@ -61,10 +69,18 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" + ffi: + dependency: transitive + description: + name: ffi + sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" + url: "https://pub.dev" + source: hosted + version: "2.1.4" fixnum: dependency: transitive description: @@ -91,22 +107,46 @@ packages: description: flutter source: sdk version: "0.0.0" + google_fonts: + dependency: "direct main" + description: + name: google_fonts + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 + url: "https://pub.dev" + source: hosted + version: "6.2.1" + http: + dependency: transitive + description: + name: http + sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f + url: "https://pub.dev" + source: hosted + version: "1.3.0" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" + source: hosted + version: "4.1.2" leak_tracker: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -127,10 +167,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -143,10 +183,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" nested: dependency: transitive description: @@ -159,10 +199,74 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" + path_provider: + dependency: transitive + description: + name: path_provider + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" + url: "https://pub.dev" + source: hosted + version: "2.1.5" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2" + url: "https://pub.dev" + source: hosted + version: "2.2.15" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + platform: + dependency: transitive + description: + name: platform + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" protobuf: dependency: transitive description: @@ -188,50 +292,58 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" vector_math: dependency: transitive description: @@ -244,10 +356,26 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.3.1" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" sdks: - dart: ">=3.6.1 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + dart: ">=3.7.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index a3e1b6a..b3dc7ad 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -36,6 +36,7 @@ dependencies: cupertino_icons: ^1.0.8 provider: ^6.1.2 barcode_scan2: ^4.4.0 + google_fonts: ^6.2.1 dev_dependencies: flutter_test: @@ -55,6 +56,7 @@ dev_dependencies: flutter: assets: - assets/ + - google_fonts/ # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class.