6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit f1c58921

AuthorNKL<nikolaj.king@gmail.com>
Date2025-01-24 13:14:08 +0100
cleaned up state and routing bug

Changed files

.../ios/Pods/Pods.xcodeproj/project.pbxproj        | 12 +++---
 .../lib/contact/cubit/contact_cubit.dart           | 10 ++---
 .../lib/contact/cubit/contact_state.dart           | 20 +++++-----
 comwell_key_app/lib/home/home_page.dart            |  2 +-
 .../overview/repository/overview_repository.dart   |  1 +
 comwell_key_app/lib/routing/app_router.dart        | 13 ++++---
 .../ephemeral/.plugin_symlinks/device_info_plus    |  1 -
 .../.plugin_symlinks/flutter_secure_storage_linux  |  1 -
 .../ephemeral/.plugin_symlinks/path_provider_linux |  1 -
 .../.plugin_symlinks/shared_preferences_linux      |  1 -
 .../.plugin_symlinks/sqlcipher_flutter_libs        |  1 -
 .../ephemeral/.plugin_symlinks/url_launcher_linux  |  1 -
 .../linux/flutter/generated_plugin_registrant.cc   | 23 ------------
 .../linux/flutter/generated_plugin_registrant.h    | 15 --------
 .../linux/flutter/generated_plugins.cmake          | 26 -------------
 .../macos/Flutter/GeneratedPluginRegistrant.swift  | 28 --------------
 .../Flutter/ephemeral/Flutter-Generated.xcconfig   | 11 ------
 .../ephemeral/flutter_export_environment.sh        | 12 ------
 comwell_key_app/macos/Podfile                      | 43 ----------------------
 19 files changed, 30 insertions(+), 192 deletions(-)

Diff

diff --git a/comwell_key_app/ios/Pods/Pods.xcodeproj/project.pbxproj b/comwell_key_app/ios/Pods/Pods.xcodeproj/project.pbxproj
index 71705b4e..37388054 100644
--- a/comwell_key_app/ios/Pods/Pods.xcodeproj/project.pbxproj
+++ b/comwell_key_app/ios/Pods/Pods.xcodeproj/project.pbxproj
@@ -498,8 +498,8 @@
607CCDB9D70C5704921615D64D7CC9E3 /* DelegatedAuthenticationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75C8B64BAB955CF805B16F7529B24EC5 /* DelegatedAuthenticationView.swift */; };
608F616E729E7EF85AA543B3C03560D4 /* StorePaymentMethodFieldAware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7182CCDB9A25231B8E22F28A0B5A81F9 /* StorePaymentMethodFieldAware.swift */; };
609ED78F48F6723D762A2C3729C9CE20 /* ActionComponentData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4DEFDC20CE0A0894F0D3958279E20CA /* ActionComponentData.swift */; };
- 60F625732D43A48900611249 /* SeosMobileKeysSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60F625722D43A48900611249 /* SeosMobileKeysSDK.xcframework */; };
- 60F625762D43A49200611249 /* SeosMobileKeysSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60F625722D43A48900611249 /* SeosMobileKeysSDK.xcframework */; };
+ 60F6257A2D43B88100611249 /* SeosMobileKeysSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60F625792D43B88100611249 /* SeosMobileKeysSDK.xcframework */; };
+ 60F6257D2D43B88B00611249 /* SeosMobileKeysSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60F625792D43B88100611249 /* SeosMobileKeysSDK.xcframework */; };
615CE18AA9C42286624E3D4BD0B19B74 /* DateValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C675377EEB1EFD28BC2C2CB183AA5376 /* DateValidator.swift */; };
615DC04DEF01B945F67890ADEEE83634 /* FIRInstallationsIIDTokenStore.h in Headers */ = {isa = PBXBuildFile; fileRef = DDE0CE14A97FE53EEAFF4D75F8D6280B /* FIRInstallationsIIDTokenStore.h */; settings = {ATTRIBUTES = (Project, ); }; };
616AB49526C4CCB0C0EF77317D3DB122 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = DFB2CC743E09ED4832DF29CC5667AADC /* PrivacyInfo.xcprivacy */; };
@@ -2398,7 +2398,7 @@
60D400D1CD47378118CD6C14818F9051 /* nanopb.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = nanopb.modulemap; sourceTree = "<group>"; };
60E94424B2CD061CCAA45C57B9DFD88B /* SelectableFormItemStyle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SelectableFormItemStyle.swift; path = Adyen/UI/Form/Items/SelectableFormItem/SelectableFormItemStyle.swift; sourceTree = "<group>"; };
60F0417D7D51133998750125ACD12B4D /* messages.g.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = messages.g.swift; path = "../../../../../../../../../../../../.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.0/darwin/path_provider_foundation/Sources/path_provider_foundation/messages.g.swift"; sourceTree = "<group>"; };
- 60F625722D43A48900611249 /* SeosMobileKeysSDK.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:333BNLD22V:ASSAABLOY AB"; lastKnownFileType = wrapper.xcframework; name = SeosMobileKeysSDK.xcframework; path = "/Users/nkl/Documents/GitHub/comwell-app/comwell_key_app/ios/../../mobilekeys_sdk_plugin/XCFrameworks/SeosMobileKeysSDK.xcframework"; sourceTree = "<absolute>"; };
+ 60F625792D43B88100611249 /* SeosMobileKeysSDK.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:333BNLD22V:ASSAABLOY AB"; lastKnownFileType = wrapper.xcframework; name = SeosMobileKeysSDK.xcframework; path = "/Users/nkl/Documents/GitHub/comwell-app/comwell_key_app/ios/../../mobilekeys_sdk_plugin/XCFrameworks/SeosMobileKeysSDK.xcframework"; sourceTree = "<absolute>"; };
614A7A44E3F83816A568862E6CD5C84F /* messages.g.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = messages.g.swift; path = "../../../../../../../../../../../../.pub-cache/hosted/pub.dev/url_launcher_ios-6.3.2/ios/url_launcher_ios/Sources/url_launcher_ios/messages.g.swift"; sourceTree = "<group>"; };
618A447E2A4DCAF99F61964E9847170E /* JSONModel.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = JSONModel.h; path = JSONModel/JSONModel/JSONModel.h; sourceTree = "<group>"; };
61D24602E1314FA474504F8105A55646 /* SimpleScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SimpleScheduler.swift; path = AdyenNetworking/APIClient/SimpleScheduler.swift; sourceTree = "<group>"; };
@@ -3420,7 +3420,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 60F625732D43A48900611249 /* SeosMobileKeysSDK.xcframework in Frameworks */,
+ 60F6257D2D43B88B00611249 /* SeosMobileKeysSDK.xcframework in Frameworks */,
1BA7E7CDE434910A21FD7A43B83763AD /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -3499,7 +3499,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 60F625762D43A49200611249 /* SeosMobileKeysSDK.xcframework in Frameworks */,
+ 60F6257A2D43B88100611249 /* SeosMobileKeysSDK.xcframework in Frameworks */,
383D2E4656BA62C3BE398594EB9D5D0D /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -7491,7 +7491,7 @@
B94D7768568A9992200DB461E8CF687F /* Frameworks */ = {
isa = PBXGroup;
children = (
- 60F625722D43A48900611249 /* SeosMobileKeysSDK.xcframework */,
+ 60F625792D43B88100611249 /* SeosMobileKeysSDK.xcframework */,
68D0E262FF83215AD89592F4FDBDE96C /* iOS */,
);
name = Frameworks;
diff --git a/comwell_key_app/lib/contact/cubit/contact_cubit.dart b/comwell_key_app/lib/contact/cubit/contact_cubit.dart
index 307823f0..2d7afab3 100644
--- a/comwell_key_app/lib/contact/cubit/contact_cubit.dart
+++ b/comwell_key_app/lib/contact/cubit/contact_cubit.dart
@@ -1,7 +1,5 @@
import 'package:bloc/bloc.dart';
import 'package:comwell_key_app/contact/repository/contact_repository.dart';
-import 'package:comwell_key_app/overview/cubit/overview_cubit.dart';
-import 'package:comwell_key_app/overview/models/booking.dart';
import 'package:comwell_key_app/overview/models/bookings.dart';
import 'package:comwell_key_app/overview/repository/overview_repository.dart';
import 'package:equatable/equatable.dart';
@@ -11,17 +9,17 @@ part 'contact_state.dart';
class ContactCubit extends Cubit<ContactState> {
final ContactRepository contactRepository;
final OverviewRepository overviewRepository;
- ContactCubit({required this.contactRepository, required this.overviewRepository}) : super(ContactInitial());
+ ContactCubit({required this.contactRepository, required this.overviewRepository}) : super(const ContactState.initial());
void sendContact(String hotelCode) async {
- emit(ContactSend());
+ emit(const ContactState.contactSend());
try {
Bookings bookings = await overviewRepository.fetchAllBookingsForUser('1');
// Send contact
contactRepository.sendContact(bookings.current[0].hotelCode);
- emit(ContactSent());
+ emit(const ContactState.contactSent());
} catch (e) {
- emit(ContactError());
+ emit(const ContactState.contactError());
}
}
}
diff --git a/comwell_key_app/lib/contact/cubit/contact_state.dart b/comwell_key_app/lib/contact/cubit/contact_state.dart
index 7bb5982a..a4f87356 100644
--- a/comwell_key_app/lib/contact/cubit/contact_state.dart
+++ b/comwell_key_app/lib/contact/cubit/contact_state.dart
@@ -1,16 +1,18 @@
part of 'contact_cubit.dart';
-sealed class ContactState extends Equatable {
- const ContactState();
+class ContactState extends Equatable {
+ const ContactState._(
+ );
- @override
- List<Object> get props => [];
-}
+const ContactState.initial() : this._();
+
+const ContactState.contactSend() : this._();
-final class ContactInitial extends ContactState {}
+const ContactState.contactSent() : this._();
-final class ContactSend extends ContactState {}
+const ContactState.contactError() : this._();
-final class ContactSent extends ContactState {}
+ @override
+ List<Object?> get props => [];
-final class ContactError extends ContactState {}
+}
\ No newline at end of file
diff --git a/comwell_key_app/lib/home/home_page.dart b/comwell_key_app/lib/home/home_page.dart
index ab852917..4524c945 100644
--- a/comwell_key_app/lib/home/home_page.dart
+++ b/comwell_key_app/lib/home/home_page.dart
@@ -71,7 +71,7 @@ class _HomeWidget extends State<HomeWidget> {
children: [
const Spacer(),
RoomKeyWidget(onPressed: () {
- context.goNamed(AppRoutes.contact.name);
+ context.pushNamed(AppRoutes.contact.name);
}),
if (state.status == HomeStatus.invalidOrNoKey)
Padding(
diff --git a/comwell_key_app/lib/overview/repository/overview_repository.dart b/comwell_key_app/lib/overview/repository/overview_repository.dart
index 38230e38..44ed90b8 100644
--- a/comwell_key_app/lib/overview/repository/overview_repository.dart
+++ b/comwell_key_app/lib/overview/repository/overview_repository.dart
@@ -1,6 +1,7 @@
import 'package:comwell_key_app/database/comwell_db.dart';
import 'package:comwell_key_app/overview/models/booking.dart';
import 'package:comwell_key_app/overview/models/bookings.dart';
+import 'package:comwell_key_app/overview/models/payment_details.dart';
import 'package:comwell_key_app/services/api.dart';
import 'package:comwell_key_app/utils/locator.dart';
diff --git a/comwell_key_app/lib/routing/app_router.dart b/comwell_key_app/lib/routing/app_router.dart
index 8b349257..b390cc3c 100644
--- a/comwell_key_app/lib/routing/app_router.dart
+++ b/comwell_key_app/lib/routing/app_router.dart
@@ -58,11 +58,13 @@ GoRouter goRouter(AuthenticationBloc authBloc) {
},
routes: <RouteBase>[
GoRoute(
- path: '/contact',
- name: AppRoutes.contact.name,
- builder: (context, state) {
- return const ContactPage(hotelCode: 'CBO',);//TODO: Get hotel code from somewhere
- }),
+ path: '//${AppRoutes.contact.name}',
+ name: AppRoutes.contact.name,
+ builder: (context, state) {
+ return const ContactPage(
+ hotelCode: 'CBO',
+ ); //TODO: Get hotel code from somewhere
+ }),
GoRoute(
path: '/loading_page',
name: AppRoutes.loadingPage.name,
@@ -128,7 +130,6 @@ GoRouter goRouter(AuthenticationBloc authBloc) {
return const KeyPage(); //mobileKey: key);
},
),
-
],
),
],
diff --git a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/device_info_plus b/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/device_info_plus
deleted file mode 120000
index 01a8f370..00000000
--- a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/device_info_plus
+++ /dev/null
@@ -1 +0,0 @@
-/Users/nkl/.pub-cache/hosted/pub.dev/device_info_plus-10.1.2/
\ No newline at end of file
diff --git a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/flutter_secure_storage_linux b/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/flutter_secure_storage_linux
deleted file mode 120000
index eff56153..00000000
--- a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/flutter_secure_storage_linux
+++ /dev/null
@@ -1 +0,0 @@
-/Users/nkl/.pub-cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.1/
\ No newline at end of file
diff --git a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux
deleted file mode 120000
index 13f0eb23..00000000
--- a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux
+++ /dev/null
@@ -1 +0,0 @@
-/Users/nkl/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
\ No newline at end of file
diff --git a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/shared_preferences_linux b/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/shared_preferences_linux
deleted file mode 120000
index af69aefe..00000000
--- a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/shared_preferences_linux
+++ /dev/null
@@ -1 +0,0 @@
-/Users/nkl/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.0/
\ No newline at end of file
diff --git a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/sqlcipher_flutter_libs b/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/sqlcipher_flutter_libs
deleted file mode 120000
index 0a49f2ef..00000000
--- a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/sqlcipher_flutter_libs
+++ /dev/null
@@ -1 +0,0 @@
-/Users/nkl/.pub-cache/hosted/pub.dev/sqlcipher_flutter_libs-0.6.4/
\ No newline at end of file
diff --git a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux b/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux
deleted file mode 120000
index 59c6d5dd..00000000
--- a/comwell_key_app/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux
+++ /dev/null
@@ -1 +0,0 @@
-/Users/nkl/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.1/
\ No newline at end of file
diff --git a/comwell_key_app/linux/flutter/generated_plugin_registrant.cc b/comwell_key_app/linux/flutter/generated_plugin_registrant.cc
deleted file mode 100644
index 6a4d8c0f..00000000
--- a/comwell_key_app/linux/flutter/generated_plugin_registrant.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Generated file. Do not edit.
-//
-
-// clang-format off
-
-#include "generated_plugin_registrant.h"
-
-#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
-#include <sqlcipher_flutter_libs/sqlite3_flutter_libs_plugin.h>
-#include <url_launcher_linux/url_launcher_plugin.h>
-
-void fl_register_plugins(FlPluginRegistry* registry) {
- g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
- fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
- flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);
- g_autoptr(FlPluginRegistrar) sqlcipher_flutter_libs_registrar =
- fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin");
- sqlite3_flutter_libs_plugin_register_with_registrar(sqlcipher_flutter_libs_registrar);
- g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
- fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
- url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
-}
diff --git a/comwell_key_app/linux/flutter/generated_plugin_registrant.h b/comwell_key_app/linux/flutter/generated_plugin_registrant.h
deleted file mode 100644
index e0f0a47b..00000000
--- a/comwell_key_app/linux/flutter/generated_plugin_registrant.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// Generated file. Do not edit.
-//
-
-// clang-format off
-
-#ifndef GENERATED_PLUGIN_REGISTRANT_
-#define GENERATED_PLUGIN_REGISTRANT_
-
-#include <flutter_linux/flutter_linux.h>
-
-// Registers Flutter plugins.
-void fl_register_plugins(FlPluginRegistry* registry);
-
-#endif // GENERATED_PLUGIN_REGISTRANT_
diff --git a/comwell_key_app/linux/flutter/generated_plugins.cmake b/comwell_key_app/linux/flutter/generated_plugins.cmake
deleted file mode 100644
index 771d30fb..00000000
--- a/comwell_key_app/linux/flutter/generated_plugins.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Generated file, do not edit.
-#
-
-list(APPEND FLUTTER_PLUGIN_LIST
- flutter_secure_storage_linux
- sqlcipher_flutter_libs
- url_launcher_linux
-)
-
-list(APPEND FLUTTER_FFI_PLUGIN_LIST
-)
-
-set(PLUGIN_BUNDLED_LIBRARIES)
-
-foreach(plugin ${FLUTTER_PLUGIN_LIST})
- add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
- target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
- list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
- list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
-endforeach(plugin)
-
-foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
- add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
- list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
-endforeach(ffi_plugin)
diff --git a/comwell_key_app/macos/Flutter/GeneratedPluginRegistrant.swift b/comwell_key_app/macos/Flutter/GeneratedPluginRegistrant.swift
deleted file mode 100644
index eb041677..00000000
--- a/comwell_key_app/macos/Flutter/GeneratedPluginRegistrant.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Generated file. Do not edit.
-//
-
-import FlutterMacOS
-import Foundation
-
-import device_info_plus
-import firebase_analytics
-import firebase_core
-import flutter_secure_storage_macos
-import path_provider_foundation
-import shared_preferences_foundation
-import sqlcipher_flutter_libs
-import url_launcher_macos
-import webview_flutter_wkwebview
-
-func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
- DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
- FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin"))
- FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
- FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
- PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
- SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
- Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin"))
- UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
- FLTWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "FLTWebViewFlutterPlugin"))
-}
diff --git a/comwell_key_app/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/comwell_key_app/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
deleted file mode 100644
index 53cd44ee..00000000
--- a/comwell_key_app/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-// This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/opt/homebrew/Caskroom/flutter/3.24.3/flutter
-FLUTTER_APPLICATION_PATH=/Users/nkl/Documents/GitHub/comwell-app/comwell_key_app
-COCOAPODS_PARALLEL_CODE_SIGN=true
-FLUTTER_BUILD_DIR=build
-FLUTTER_BUILD_NAME=0.0.1
-FLUTTER_BUILD_NUMBER=8
-DART_OBFUSCATION=false
-TRACK_WIDGET_CREATION=true
-TREE_SHAKE_ICONS=false
-PACKAGE_CONFIG=.dart_tool/package_config.json
diff --git a/comwell_key_app/macos/Flutter/ephemeral/flutter_export_environment.sh b/comwell_key_app/macos/Flutter/ephemeral/flutter_export_environment.sh
deleted file mode 100755
index 9ec80755..00000000
--- a/comwell_key_app/macos/Flutter/ephemeral/flutter_export_environment.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/opt/homebrew/Caskroom/flutter/3.24.3/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/nkl/Documents/GitHub/comwell-app/comwell_key_app"
-export "COCOAPODS_PARALLEL_CODE_SIGN=true"
-export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=0.0.1"
-export "FLUTTER_BUILD_NUMBER=8"
-export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=true"
-export "TREE_SHAKE_ICONS=false"
-export "PACKAGE_CONFIG=.dart_tool/package_config.json"
diff --git a/comwell_key_app/macos/Podfile b/comwell_key_app/macos/Podfile
deleted file mode 100644
index c795730d..00000000
--- a/comwell_key_app/macos/Podfile
+++ /dev/null
@@ -1,43 +0,0 @@
-platform :osx, '10.14'
-
-# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
-ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-
-project 'Runner', {
- 'Debug' => :debug,
- 'Profile' => :release,
- 'Release' => :release,
-}
-
-def flutter_root
- generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
- unless File.exist?(generated_xcode_build_settings_path)
- raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
- end
-
- File.foreach(generated_xcode_build_settings_path) do |line|
- matches = line.match(/FLUTTER_ROOT\=(.*)/)
- return matches[1].strip if matches
- end
- raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
-end
-
-require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
-
-flutter_macos_podfile_setup
-
-target 'Runner' do
- use_frameworks!
- use_modular_headers!
-
- flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
- target 'RunnerTests' do
- inherit! :search_paths
- end
-end
-
-post_install do |installer|
- installer.pods_project.targets.each do |target|
- flutter_additional_macos_build_settings(target)
- end
-end