6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 8aa7199f
Changed files
.DS_Store | Bin 6148 -> 6148 bytes comwell_key_app/android/app/build.gradle | 2 +- comwell_key_app/lib/comwell_app.dart | 2 +- comwell_key_app/lib/home/bloc/home_bloc.dart | 5 +++++ comwell_key_app/lib/home/home_page.dart | 6 ++++-- comwell_key_app/lib/utils/locator.dart | 9 +++++++-- comwell_key_app/lib/welcome/bloc/welcome_bloc.dart | 5 +++++ comwell_key_app/lib/welcome/welcome_page.dart | 2 +- 8 files changed, 24 insertions(+), 7 deletions(-)
Diff
diff --git a/.DS_Store b/.DS_Store
index 9be884fa..7ab9cebb 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/comwell_key_app/android/app/build.gradle b/comwell_key_app/android/app/build.gradle
index 49995bc3..2b7beaf9 100644
--- a/comwell_key_app/android/app/build.gradle
+++ b/comwell_key_app/android/app/build.gradle
@@ -71,7 +71,7 @@ flutter {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
//aar file from libs dir. Name and version is from the filename.
- debugImplementation files('../../../android/libs/mobilekeys-android-sdk-debug-8.0.7.aar')
+ debugImplementation files('../../../mobilekeys_sdk_plugin/android/libs/mobilekeys-android-sdk-debug-8.0.7.aar')
releaseImplementation files('../../../android/libs/libs/mobilekeys-android-sdk-release-8.0.7.aar')
debugImplementation 'com.github.tony19:logback-android:3.0.0'
diff --git a/comwell_key_app/lib/comwell_app.dart b/comwell_key_app/lib/comwell_app.dart
index 1a6bc80b..1fe235ba 100644
--- a/comwell_key_app/lib/comwell_app.dart
+++ b/comwell_key_app/lib/comwell_app.dart
@@ -47,7 +47,7 @@ final List<BlocProvider> blocProviderList = [
create: (BuildContext context) => HomeBloc(homeRepository: HomeRepository()),
),
BlocProvider<KeyBloc>(
- lazy: false,
+ lazy: true,
create: (BuildContext context) => KeyBloc(keyRepository: locator<KeyRepository>(), homeRepository: HomeRepository()),
),
];
diff --git a/comwell_key_app/lib/home/bloc/home_bloc.dart b/comwell_key_app/lib/home/bloc/home_bloc.dart
index b776bc06..c1d60d7c 100644
--- a/comwell_key_app/lib/home/bloc/home_bloc.dart
+++ b/comwell_key_app/lib/home/bloc/home_bloc.dart
@@ -1,5 +1,6 @@
import 'package:bloc/bloc.dart';
import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart';
import 'package:seos_mobile_keys_plugin/app_usage_api.dart';
import 'package:comwell_key_app/home/home_repository.dart';
@@ -34,6 +35,10 @@ class HomeBloc extends Bloc<HomeEvent,HomeState> {
});
on<SearchForKeysEvent>((event, emit) async {
+ if(kIsWeb) {
+ emit(InvalidOrNoKey());
+ return;
+ }
List<MobileKeysKey?>? keys = await homeRepository.refreshKeys();
if(keys != null) {
if(keys.length == 1) {
diff --git a/comwell_key_app/lib/home/home_page.dart b/comwell_key_app/lib/home/home_page.dart
index 3d94c38b..5073ff73 100644
--- a/comwell_key_app/lib/home/home_page.dart
+++ b/comwell_key_app/lib/home/home_page.dart
@@ -73,6 +73,8 @@ Future<void> _updateEndpoint() async {
Expanded(
child: Image.asset(
'assets/images/welcome_image.jpeg',
+ width: double.infinity,
+ height: 300,
fit: BoxFit.cover,
)),
const SizedBox(height: 100),
@@ -88,9 +90,9 @@ Future<void> _updateEndpoint() async {
context.goNamed(AppRoutes.key.name);
})
else if (state is InvalidOrNoKey)
- ColorFiltered(colorFilter: const ColorFilter.mode(Colors.grey, BlendMode.saturation), child: RoomKeyWidget(onPressed: () {
+ RoomKeyWidget(isMultipleKeys: true,onPressed: () {
context.goNamed(AppRoutes.key.name);
- }))
+ })
else if (state is MultipleKeys)
RoomKeyWidget(isMultipleKeys: true,onPressed: () {
context.goNamed(AppRoutes.key.name);
diff --git a/comwell_key_app/lib/utils/locator.dart b/comwell_key_app/lib/utils/locator.dart
index 48b24b6b..f10b6fba 100644
--- a/comwell_key_app/lib/utils/locator.dart
+++ b/comwell_key_app/lib/utils/locator.dart
@@ -1,11 +1,16 @@
import 'package:comwell_key_app/key/repository/key_repository.dart';
+import 'package:flutter/foundation.dart';
import 'package:get_it/get_it.dart';
import 'package:seos_mobile_keys_plugin/seos_mobile_keys_plugin.dart';
import 'package:device_info/device_info.dart';
final locator = GetIt.I;
void setupLocator() {
- locator.registerSingleton(SeosMobileKeysPlugin);
locator.registerFactory<DeviceInfoPlugin>(() => DeviceInfoPlugin());
- locator.registerFactory<KeyRepository>(() => KeyRepository(deviceInfoPlugin: locator<DeviceInfoPlugin>(), seosMobileKeysPlugin: locator<SeosMobileKeysPlugin>()));
+ if(!kIsWeb) {
+ locator.registerSingleton(SeosMobileKeysPlugin());
+ locator.registerFactory<KeyRepository>(() => KeyRepository(deviceInfoPlugin: locator<DeviceInfoPlugin>(), seosMobileKeysPlugin: locator<SeosMobileKeysPlugin>()));
+ }
+
+
}
\ No newline at end of file
diff --git a/comwell_key_app/lib/welcome/bloc/welcome_bloc.dart b/comwell_key_app/lib/welcome/bloc/welcome_bloc.dart
index 9d9e556d..0c36dfe8 100644
--- a/comwell_key_app/lib/welcome/bloc/welcome_bloc.dart
+++ b/comwell_key_app/lib/welcome/bloc/welcome_bloc.dart
@@ -2,6 +2,7 @@ import 'package:bloc/bloc.dart';
import 'package:comwell_key_app/welcome/welcome_repository.dart';
import 'package:comwell_key_app/welcome/welcome_status.dart';
import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart';
part 'welcome_event.dart';
part 'welcome_state.dart';
@@ -13,6 +14,10 @@ class WelcomeBloc extends Bloc<WelcomeEvent, WelcomeState> {
on<WelcomeSetupStarted>((event, emit) async {
emit(const WelcomeState.setupStarted());
try {
+ if(kIsWeb){
+ emit(const WelcomeState.setupComplete());
+ return;
+ }
bool? isSetup = await welcomeRepository.startMobilePlugin();
if (isSetup == true) {
emit(const WelcomeState.setupComplete());
diff --git a/comwell_key_app/lib/welcome/welcome_page.dart b/comwell_key_app/lib/welcome/welcome_page.dart
index e5a9918c..9729705a 100644
--- a/comwell_key_app/lib/welcome/welcome_page.dart
+++ b/comwell_key_app/lib/welcome/welcome_page.dart
@@ -70,7 +70,7 @@ class WelcomePage extends StatelessWidget {
if(codeSet != null){
context.goNamed(AppRoutes.home.name);
} else {
- context.goNamed(AppRoutes.redeem.name);
+ context.goNamed(AppRoutes.home.name);
}
}
},