Fix versions and bugs

.github/workflows/flutter.yaml

@@ -46,7 +46,7 @@ jobs:
  - name: do flutter stuff
  uses: subosito/flutter-action@v2
  with:
- flutter-version: "3.3.9"
+ flutter-version: "3.16.5"
  - run: flutter pub get
  - run: flutter test
  - run: flutter build apk

.gitignore

@@ -82,6 +82,7 @@ amplify/\#current-cloud-backend
 amplify/.config/local-*
 amplify/logs
 amplify/mock-data
+amplify/mock-api-resources
 amplify/backend/amplify-meta.json
 amplify/backend/.temp
 build/

android/app/build.gradle

@@ -47,7 +47,7 @@ android {
  applicationId "com.example.hacklytics_checkin_flutter"
  // You can update the following values to match your application needs.
  // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
- minSdkVersion 21
+ minSdkVersion 24
  targetSdkVersion flutter.targetSdkVersion
  versionCode flutterVersionCode.toInteger()
  versionName flutterVersionName

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
- ext.kotlin_version = '1.6.10'
+ ext.kotlin_version = '1.8.0'
  repositories {
  google()
  mavenCentral()
@@ -26,6 +26,6 @@ subprojects {
  project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
  delete rootProject.buildDir
 }

lib/models/AdminSettings.dart

@@ -19,20 +19,19 @@
 
 // ignore_for_file: public_member_api_docs, annotate_overrides, dead_code, dead_codepublic_member_api_docs, depend_on_referenced_packages, file_names, library_private_types_in_public_api, no_leading_underscores_for_library_prefixes, no_leading_underscores_for_local_identifiers, non_constant_identifier_names, null_check_on_nullable_type_parameter, prefer_adjacent_string_concatenation, prefer_const_constructors, prefer_if_null_operators, prefer_interpolation_to_compose_strings, slash_for_doc_comments, sort_child_properties_last, unnecessary_const, unnecessary_constructor_name, unnecessary_late, unnecessary_new, unnecessary_null_aware_assignments, unnecessary_nullable_for_final_variable_declarations, unnecessary_string_interpolations, use_build_context_synchronously
 
-import 'package:amplify_core/amplify_core.dart';
+import 'ModelProvider.dart';
+import 'package:amplify_core/amplify_core.dart' as amplify_core;
 import 'package:collection/collection.dart';
-import 'package:flutter/foundation.dart';
 
 
 /** This is an auto generated class representing the AdminSettings type in your schema. */
-@immutable
-class AdminSettings extends Model {
+class AdminSettings extends amplify_core.Model {
  static const classType = const _AdminSettingsModelType();
  final String id;
  final bool? _hacklyticsOpen;
  final List<String>? _participantEmails;
- final TemporalDateTime? _createdAt;
- final TemporalDateTime? _updatedAt;
+ final amplify_core.TemporalDateTime? _createdAt;
+ final amplify_core.TemporalDateTime? _updatedAt;
 
  @override
  getInstanceType() => classType;
@@ -50,19 +49,19 @@ class AdminSettings extends Model {
  return _participantEmails;
  }
 
- TemporalDateTime? get createdAt {
+ amplify_core.TemporalDateTime? get createdAt {
  return _createdAt;
  }
 
- TemporalDateTime? get updatedAt {
+ amplify_core.TemporalDateTime? get updatedAt {
  return _updatedAt;
  }
 
  const AdminSettings._internal({required this.id, hacklyticsOpen, participantEmails, createdAt, updatedAt}): _hacklyticsOpen = hacklyticsOpen, _participantEmails = participantEmails, _createdAt = createdAt, _updatedAt = updatedAt;
 
  factory AdminSettings({String? id, bool? hacklyticsOpen, List<String>? participantEmails}) {
  return AdminSettings._internal(
- id: id == null ? UUID.getUUID() : id,
+ id: id == null ? amplify_core.UUID.getUUID() : id,
  hacklyticsOpen: hacklyticsOpen,
  participantEmails: participantEmails != null ? List<String>.unmodifiable(participantEmails) : participantEmails);
  }
@@ -105,82 +104,98 @@ class AdminSettings extends Model {
  participantEmails: participantEmails ?? this.participantEmails);
  }
 
+ AdminSettings copyWithModelFieldValues({
+ ModelFieldValue<String>? id,
+ ModelFieldValue<bool?>? hacklyticsOpen,
+ ModelFieldValue<List<String>?>? participantEmails
+ }) {
+ return AdminSettings._internal(
+ id: id == null ? this.id : id.value,
+ hacklyticsOpen: hacklyticsOpen == null ? this.hacklyticsOpen : hacklyticsOpen.value,
+ participantEmails: participantEmails == null ? this.participantEmails : participantEmails.value
+ );
+ }
+
  AdminSettings.fromJson(Map<String, dynamic> json) 
  : id = json['id'],
  _hacklyticsOpen = json['hacklyticsOpen'],
  _participantEmails = json['participantEmails']?.cast<String>(),
- _createdAt = json['createdAt'] != null ? TemporalDateTime.fromString(json['createdAt']) : null,
- _updatedAt = json['updatedAt'] != null ? TemporalDateTime.fromString(json['updatedAt']) : null;
+ _createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
+ _updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
 
  Map<String, dynamic> toJson() => {
  'id': id, 'hacklyticsOpen': _hacklyticsOpen, 'participantEmails': _participantEmails, 'createdAt': _createdAt?.format(), 'updatedAt': _updatedAt?.format()
  };
 
  Map<String, Object?> toMap() => {
- 'id': id, 'hacklyticsOpen': _hacklyticsOpen, 'participantEmails': _participantEmails, 'createdAt': _createdAt, 'updatedAt': _updatedAt
+ 'id': id,
+ 'hacklyticsOpen': _hacklyticsOpen,
+ 'participantEmails': _participantEmails,
+ 'createdAt': _createdAt,
+ 'updatedAt': _updatedAt
  };
 
- static final QueryField ID = QueryField(fieldName: "id");
- static final QueryField HACKLYTICSOPEN = QueryField(fieldName: "hacklyticsOpen");
- static final QueryField PARTICIPANTEMAILS = QueryField(fieldName: "participantEmails");
- static var schema = Model.defineSchema(define: (ModelSchemaDefinition modelSchemaDefinition) {
+ static final ID = amplify_core.QueryField(fieldName: "id");
+ static final HACKLYTICSOPEN = amplify_core.QueryField(fieldName: "hacklyticsOpen");
+ static final PARTICIPANTEMAILS = amplify_core.QueryField(fieldName: "participantEmails");
+ static var schema = amplify_core.Model.defineSchema(define: (amplify_core.ModelSchemaDefinition modelSchemaDefinition) {
  modelSchemaDefinition.name = "AdminSettings";
  modelSchemaDefinition.pluralName = "AdminSettings";
 
  modelSchemaDefinition.authRules = [
- AuthRule(
- authStrategy: AuthStrategy.PUBLIC,
- operations: [
- ModelOperation.CREATE,
- ModelOperation.UPDATE,
- ModelOperation.DELETE,
- ModelOperation.READ
+ amplify_core.AuthRule(
+ authStrategy: amplify_core.AuthStrategy.PUBLIC,
+ operations: const [
+ amplify_core.ModelOperation.CREATE,
+ amplify_core.ModelOperation.UPDATE,
+ amplify_core.ModelOperation.DELETE,
+ amplify_core.ModelOperation.READ
  ]),
- AuthRule(
- authStrategy: AuthStrategy.GROUPS,
+ amplify_core.AuthRule(
+ authStrategy: amplify_core.AuthStrategy.GROUPS,
  groupClaim: "cognito:groups",
  groups: [ "Administrator" ],
- provider: AuthRuleProvider.USERPOOLS,
- operations: [
- ModelOperation.READ,
- ModelOperation.CREATE,
- ModelOperation.UPDATE,
- ModelOperation.DELETE
+ provider: amplify_core.AuthRuleProvider.USERPOOLS,
+ operations: const [
+ amplify_core.ModelOperation.READ,
+ amplify_core.ModelOperation.CREATE,
+ amplify_core.ModelOperation.UPDATE,
+ amplify_core.ModelOperation.DELETE
  ])
  ];
 
- modelSchemaDefinition.addField(ModelFieldDefinition.id());
+ modelSchemaDefinition.addField(amplify_core.ModelFieldDefinition.id());
 
- modelSchemaDefinition.addField(ModelFieldDefinition.field(
+ modelSchemaDefinition.addField(amplify_core.ModelFieldDefinition.field(
  key: AdminSettings.HACKLYTICSOPEN,
  isRequired: false,
- ofType: ModelFieldType(ModelFieldTypeEnum.bool)
+ ofType: amplify_core.ModelFieldType(amplify_core.ModelFieldTypeEnum.bool)
  ));
 
- modelSchemaDefinition.addField(ModelFieldDefinition.field(
+ modelSchemaDefinition.addField(amplify_core.ModelFieldDefinition.field(
  key: AdminSettings.PARTICIPANTEMAILS,
  isRequired: false,
  isArray: true,
- ofType: ModelFieldType(ModelFieldTypeEnum.collection, ofModelName: describeEnum(ModelFieldTypeEnum.string))
+ ofType: amplify_core.ModelFieldType(amplify_core.ModelFieldTypeEnum.collection, ofModelName: amplify_core.ModelFieldTypeEnum.string.name)
  ));
 
- modelSchemaDefinition.addField(ModelFieldDefinition.nonQueryField(
+ modelSchemaDefinition.addField(amplify_core.ModelFieldDefinition.nonQueryField(
  fieldName: 'createdAt',
  isRequired: false,
  isReadOnly: true,
- ofType: ModelFieldType(ModelFieldTypeEnum.dateTime)
+ ofType: amplify_core.ModelFieldType(amplify_core.ModelFieldTypeEnum.dateTime)
  ));
 
- modelSchemaDefinition.addField(ModelFieldDefinition.nonQueryField(
+ modelSchemaDefinition.addField(amplify_core.ModelFieldDefinition.nonQueryField(
  fieldName: 'updatedAt',
  isRequired: false,
  isReadOnly: true,
- ofType: ModelFieldType(ModelFieldTypeEnum.dateTime)
+ ofType: amplify_core.ModelFieldType(amplify_core.ModelFieldTypeEnum.dateTime)
  ));
  });
 }
 
-class _AdminSettingsModelType extends ModelType<AdminSettings> {
+class _AdminSettingsModelType extends amplify_core.ModelType<AdminSettings> {
  const _AdminSettingsModelType();
 
  @override