Skip to content

Commit 7534799

Browse files
committed
Ensure Backwards Compatibility of Library Barcode
1 parent 025d83d commit 7534799

File tree

6 files changed

+105
-98
lines changed

6 files changed

+105
-98
lines changed

ios/Podfile.lock

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
PODS:
22
- device_info_plus (0.0.1):
33
- Flutter
4-
- Firebase/CoreOnly (12.6.0):
5-
- FirebaseCore (~> 12.6.0)
6-
- Firebase/Crashlytics (12.6.0):
4+
- Firebase/CoreOnly (12.8.0):
5+
- FirebaseCore (~> 12.8.0)
6+
- Firebase/Crashlytics (12.8.0):
77
- Firebase/CoreOnly
8-
- FirebaseCrashlytics (~> 12.6.0)
9-
- Firebase/RemoteConfig (12.6.0):
8+
- FirebaseCrashlytics (~> 12.8.0)
9+
- Firebase/RemoteConfig (12.8.0):
1010
- Firebase/CoreOnly
11-
- FirebaseRemoteConfig (~> 12.6.0)
12-
- firebase_core (4.3.0):
13-
- Firebase/CoreOnly (= 12.6.0)
11+
- FirebaseRemoteConfig (~> 12.8.0)
12+
- firebase_core (4.4.0):
13+
- Firebase/CoreOnly (= 12.8.0)
1414
- Flutter
15-
- firebase_crashlytics (5.0.6):
16-
- Firebase/Crashlytics (= 12.6.0)
15+
- firebase_crashlytics (5.0.7):
16+
- Firebase/Crashlytics (= 12.8.0)
1717
- firebase_core
1818
- Flutter
19-
- firebase_remote_config (6.1.3):
20-
- Firebase/RemoteConfig (= 12.6.0)
19+
- firebase_remote_config (6.1.4):
20+
- Firebase/RemoteConfig (= 12.8.0)
2121
- firebase_core
2222
- Flutter
23-
- FirebaseABTesting (12.6.0):
24-
- FirebaseCore (~> 12.6.0)
25-
- FirebaseCore (12.6.0):
26-
- FirebaseCoreInternal (~> 12.6.0)
23+
- FirebaseABTesting (12.8.0):
24+
- FirebaseCore (~> 12.8.0)
25+
- FirebaseCore (12.8.0):
26+
- FirebaseCoreInternal (~> 12.8.0)
2727
- GoogleUtilities/Environment (~> 8.1)
2828
- GoogleUtilities/Logger (~> 8.1)
29-
- FirebaseCoreExtension (12.6.0):
30-
- FirebaseCore (~> 12.6.0)
31-
- FirebaseCoreInternal (12.6.0):
29+
- FirebaseCoreExtension (12.8.0):
30+
- FirebaseCore (~> 12.8.0)
31+
- FirebaseCoreInternal (12.8.0):
3232
- "GoogleUtilities/NSData+zlib (~> 8.1)"
33-
- FirebaseCrashlytics (12.6.0):
34-
- FirebaseCore (~> 12.6.0)
35-
- FirebaseInstallations (~> 12.6.0)
36-
- FirebaseRemoteConfigInterop (~> 12.6.0)
37-
- FirebaseSessions (~> 12.6.0)
33+
- FirebaseCrashlytics (12.8.0):
34+
- FirebaseCore (~> 12.8.0)
35+
- FirebaseInstallations (~> 12.8.0)
36+
- FirebaseRemoteConfigInterop (~> 12.8.0)
37+
- FirebaseSessions (~> 12.8.0)
3838
- GoogleDataTransport (~> 10.1)
3939
- GoogleUtilities/Environment (~> 8.1)
4040
- nanopb (~> 3.30910.0)
4141
- PromisesObjC (~> 2.4)
42-
- FirebaseInstallations (12.6.0):
43-
- FirebaseCore (~> 12.6.0)
42+
- FirebaseInstallations (12.8.0):
43+
- FirebaseCore (~> 12.8.0)
4444
- GoogleUtilities/Environment (~> 8.1)
4545
- GoogleUtilities/UserDefaults (~> 8.1)
4646
- PromisesObjC (~> 2.4)
47-
- FirebaseRemoteConfig (12.6.0):
48-
- FirebaseABTesting (~> 12.6.0)
49-
- FirebaseCore (~> 12.6.0)
50-
- FirebaseInstallations (~> 12.6.0)
51-
- FirebaseRemoteConfigInterop (~> 12.6.0)
52-
- FirebaseSharedSwift (~> 12.6.0)
47+
- FirebaseRemoteConfig (12.8.0):
48+
- FirebaseABTesting (~> 12.8.0)
49+
- FirebaseCore (~> 12.8.0)
50+
- FirebaseInstallations (~> 12.8.0)
51+
- FirebaseRemoteConfigInterop (~> 12.8.0)
52+
- FirebaseSharedSwift (~> 12.8.0)
5353
- GoogleUtilities/Environment (~> 8.1)
5454
- "GoogleUtilities/NSData+zlib (~> 8.1)"
55-
- FirebaseRemoteConfigInterop (12.6.0)
56-
- FirebaseSessions (12.6.0):
57-
- FirebaseCore (~> 12.6.0)
58-
- FirebaseCoreExtension (~> 12.6.0)
59-
- FirebaseInstallations (~> 12.6.0)
55+
- FirebaseRemoteConfigInterop (12.8.0)
56+
- FirebaseSessions (12.8.0):
57+
- FirebaseCore (~> 12.8.0)
58+
- FirebaseCoreExtension (~> 12.8.0)
59+
- FirebaseInstallations (~> 12.8.0)
6060
- GoogleDataTransport (~> 10.1)
6161
- GoogleUtilities/Environment (~> 8.1)
6262
- GoogleUtilities/UserDefaults (~> 8.1)
6363
- nanopb (~> 3.30910.0)
6464
- PromisesSwift (~> 2.1)
65-
- FirebaseSharedSwift (12.6.0)
65+
- FirebaseSharedSwift (12.8.0)
6666
- Flutter (1.0.0)
6767
- flutter_contacts (0.0.1):
6868
- Flutter
@@ -234,20 +234,20 @@ EXTERNAL SOURCES:
234234

235235
SPEC CHECKSUMS:
236236
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
237-
Firebase: a451a7b61536298fd5cbfe3a746fd40443a50679
238-
firebase_core: ba00a168e719694f38960502ceb560285603d073
239-
firebase_crashlytics: 13f4b77e9ce2a84b1f8ea07f293db5b6213ce1cf
240-
firebase_remote_config: 4315c34bfba52eb501b69cfa84d519f340385a37
241-
FirebaseABTesting: 119f0a2b2e68b1ae05d248c5adb2455f148f20c1
242-
FirebaseCore: 0e38ad5d62d980a47a64b8e9301ffa311457be04
243-
FirebaseCoreExtension: 032fd6f8509e591fda8cb76f6651f20d926b121f
244-
FirebaseCoreInternal: 69bf1306a05b8ac43004f6cc1f804bb7b05b229e
245-
FirebaseCrashlytics: 3d6248c50726ee7832aef0e53cb84c9e64d9fa7e
246-
FirebaseInstallations: 631b38da2e11a83daa4bfb482f79d286a5dfa7ad
247-
FirebaseRemoteConfig: c5dfe22828a7ae7673d16224ea92743687e993df
248-
FirebaseRemoteConfigInterop: 3443b8cb8fffd76bb3e03b2a84bfd3db952fcda4
249-
FirebaseSessions: 2e8f808347e665dff3e5843f275715f07045297d
250-
FirebaseSharedSwift: 79f27fff0addd15c3de19b87fba426f3cc2c964f
237+
Firebase: 9a58fdbc9d8655ed7b79a19cf9690bb007d3d46d
238+
firebase_core: ee30637e6744af8e0c12a6a1e8a9718506ec2398
239+
firebase_crashlytics: 28b8f39df8104131376393e6af658b8b77dd120f
240+
firebase_remote_config: 3a5639062e130c4d4b7c4bae347cc3bac90f5a1e
241+
FirebaseABTesting: 31266c7845f9adde0f2e8a59267e9c82e4050898
242+
FirebaseCore: 0dbad74bda10b8fb9ca34ad8f375fb9dd3ebef7c
243+
FirebaseCoreExtension: 6605938d51f765d8b18bfcafd2085276a252bee2
244+
FirebaseCoreInternal: fe5fa466aeb314787093a7dce9f0beeaad5a2a21
245+
FirebaseCrashlytics: fb31c6907e5b52aa252668394d3f1ab326df1511
246+
FirebaseInstallations: 6a14ab3d694ebd9f839c48d330da5547e9ca9dc0
247+
FirebaseRemoteConfig: e9e3909162a05bc0e796326255fd43250783a2a9
248+
FirebaseRemoteConfigInterop: 869ddca16614f979e5c931ece11fbb0b8729ed41
249+
FirebaseSessions: d614ca154c63dbbc6c10d6c38259c2162c4e7c9b
250+
FirebaseSharedSwift: f57ed48f4542b2d7eb4738f4f23ba443f78b3780
251251
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
252252
flutter_contacts: 5383945387e7ca37cf963d4be57c21f2fc15ca9f
253253
flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf

lib/studentCardComponent/model/student_card.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ class StudentCard {
1616
final String studyID;
1717

1818
@JsonKey(name: "bibliotheksnummer")
19-
final String libraryID;
19+
final String? libraryID;
20+
21+
@JsonKey(name: "bibliothekskennung")
22+
final String? libraryCode;
2023

2124
@JsonKey(name: "chip_id_prime")
2225
final String chipID;
@@ -40,7 +43,8 @@ class StudentCard {
4043
required this.name,
4144
required this.birthday,
4245
required this.studyID,
43-
required this.libraryID,
46+
this.libraryID,
47+
this.libraryCode,
4448
required this.chipID,
4549
required this.semester,
4650
required this.validFrom,

lib/studentCardComponent/model/student_card.g.dart

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/studentCardComponent/views/bar_code_view.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import 'package:easy_localization/easy_localization.dart';
44
import 'package:flutter/material.dart';
55

66
class BarCodeView extends StatelessWidget {
7-
final String libraryID;
7+
final String payload;
88

9-
const BarCodeView({super.key, required this.libraryID});
9+
const BarCodeView({super.key, required this.payload});
1010

1111
@override
1212
Widget build(BuildContext context) {
@@ -25,7 +25,7 @@ class BarCodeView extends StatelessWidget {
2525
child: BarcodeWidget(
2626
height: 70,
2727
padding: const EdgeInsets.all(10),
28-
data: libraryID,
28+
data: payload,
2929
barcode: Barcode.code128(),
3030
drawText: false,
3131
),
@@ -34,7 +34,7 @@ class BarCodeView extends StatelessWidget {
3434
Padding(
3535
padding: EdgeInsets.symmetric(vertical: context.halfPadding),
3636
child: Text(
37-
"${context.tr("libraryNumber")}: $libraryID",
37+
payload,
3838
style: Theme.of(context).textTheme.labelLarge,
3939
),
4040
),

lib/studentCardComponent/views/student_card_view.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ class StudentCardView extends ConsumerWidget {
3232
_header(lastFetched, context, ref),
3333
_warningCard(context),
3434
InformationView(studentCard: data),
35-
BarCodeView(libraryID: data.libraryID),
35+
if (data.libraryCode ?? data.libraryID case final payload?)
36+
BarCodeView(payload: payload),
3637
],
3738
);
3839
} else {

0 commit comments

Comments
 (0)