From 439d6a81ebc2a17434228034b5f7c37c518b467a Mon Sep 17 00:00:00 2001 From: Supan Adit Pratama Date: Sun, 22 Sep 2024 13:41:32 +0700 Subject: [PATCH] fix: no alice --- android/app/build.gradle | 2 +- .../authentication/authentication_bloc.dart | 6 +- lib/config.dart | 4 +- lib/main.dart | 14 +- pubspec.lock | 211 ++++-------------- pubspec.yaml | 1 - 6 files changed, 52 insertions(+), 186 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d2a4376..09d602e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -38,7 +38,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.geosmart" + applicationId "com.supanadit.geosmart" minSdkVersion 16 targetSdkVersion 28 versionCode flutterVersionCode.toInteger() diff --git a/lib/bloc/authentication/authentication_bloc.dart b/lib/bloc/authentication/authentication_bloc.dart index ea0cc31..874dc40 100644 --- a/lib/bloc/authentication/authentication_bloc.dart +++ b/lib/bloc/authentication/authentication_bloc.dart @@ -1,4 +1,4 @@ -import 'package:alice/alice.dart'; +// import 'package:alice/alice.dart'; import 'package:dio/dio.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:geosmart/bloc/authentication/authentication_event.dart'; @@ -8,11 +8,11 @@ import 'package:meta/meta.dart'; class AuthenticationBloc extends Bloc { - final Alice alice; + // final Alice alice; final Dio dio; AuthenticationBloc({ - @required this.alice, + // @required this.alice, @required this.dio, }) : super(AuthenticationInitial()); diff --git a/lib/config.dart b/lib/config.dart index c6082db..018f272 100644 --- a/lib/config.dart +++ b/lib/config.dart @@ -1,5 +1,5 @@ class Config { - static const String api = "http://api.geosmart.supanadit.com"; + static const String api = "https://api.geosmart.supanadit.com"; static const bool dynamicHostSetting = false; - static const bool showInterceptor = true; + static const bool showInterceptor = false; } diff --git a/lib/main.dart b/lib/main.dart index 4ebb7df..760d520 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:alice/alice.dart'; +// import 'package:alice/alice.dart'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; @@ -11,16 +11,16 @@ import 'bloc/bloc.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - final Alice alice = Alice(showNotification: Config.showInterceptor); + // final Alice alice = Alice(showNotification: Config.showInterceptor); final Dio dio = Dio(); - dio.interceptors.add(alice.getDioInterceptor()); + // dio.interceptors.add(alice.getDioInterceptor()); runApp( MultiBlocProvider( providers: [ BlocProvider( create: (context) => AuthenticationBloc( - alice: alice, + // alice: alice, dio: dio, )..add(AuthenticationStarted()), ), @@ -49,9 +49,9 @@ class MyApp extends StatelessWidget { Widget build(BuildContext context) { return MaterialApp( title: 'Geo Smart App', - navigatorKey: BlocProvider.of( - context, - ).alice.getNavigatorKey(), + // navigatorKey: BlocProvider.of( + // context, + // ).alice.getNavigatorKey(), theme: ThemeData( primarySwatch: Colors.blue, ), diff --git a/pubspec.lock b/pubspec.lock index 49d031f..922523a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,76 +1,55 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - alice: - dependency: "direct main" - description: - name: alice - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.3" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.2" + version: "2.5.0-nullsafety.1" bloc: dependency: transitive description: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "6.0.1" + version: "6.1.3" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety.1" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0-nullsafety.3" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" - chewie: - dependency: transitive - description: - name: chewie - url: "https://pub.dartlang.org" - source: hosted - version: "0.9.10" - chopper: - dependency: transitive - description: - name: chopper - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.3" + version: "1.2.0-nullsafety.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.1.0-nullsafety.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.13" + version: "1.15.0-nullsafety.3" cupertino_icons: dependency: "direct main" description: @@ -84,21 +63,21 @@ packages: name: dio url: "https://pub.dartlang.org" source: hosted - version: "3.0.9" + version: "3.0.10" equatable: dependency: "direct main" description: name: equatable url: "https://pub.dartlang.org" source: hosted - version: "1.2.3" + version: "1.2.6" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0-nullsafety.1" ffi: dependency: transitive description: @@ -124,28 +103,14 @@ packages: name: flutter_bloc url: "https://pub.dartlang.org" source: hosted - version: "6.0.1" - flutter_local_notifications: - dependency: transitive - description: - name: flutter_local_notifications - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.4+2" - flutter_local_notifications_platform_interface: - dependency: transitive - description: - name: flutter_local_notifications_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" + version: "6.1.3" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "1.0.8" + version: "1.0.11" flutter_test: dependency: "direct dev" description: flutter @@ -162,7 +127,7 @@ packages: name: geolocator url: "https://pub.dartlang.org" source: hosted - version: "6.1.14" + version: "6.2.1" geolocator_platform_interface: dependency: transitive description: @@ -170,6 +135,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.9" + geolocator_web: + dependency: transitive + description: + name: geolocator_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" google_maps_flutter: dependency: "direct main" description: @@ -190,7 +162,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.12.1" + version: "0.12.2" http_parser: dependency: transitive description: @@ -205,27 +177,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.16.1" - logging: - dependency: transitive - description: - name: logging - url: "https://pub.dartlang.org" - source: hosted - version: "0.11.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.8" + version: "0.12.10-nullsafety.1" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.8" + version: "1.3.0-nullsafety.3" nested: dependency: transitive description: @@ -233,41 +198,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.0.4" - open_file: - dependency: transitive - description: - name: open_file - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.1" - open_iconic_flutter: - dependency: transitive - description: - name: open_iconic_flutter - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.0" - package_info: - dependency: transitive - description: - name: package_info - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.1" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" - path_provider: - dependency: transitive - description: - name: path_provider - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.11" + version: "1.8.0-nullsafety.1" path_provider_linux: dependency: transitive description: @@ -275,13 +212,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.0.1+2" - path_provider_macos: - dependency: transitive - description: - name: path_provider_macos - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.4+3" path_provider_platform_interface: dependency: transitive description: @@ -302,21 +232,7 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.9.0" - permission_handler: - dependency: transitive - description: - name: permission_handler - url: "https://pub.dartlang.org" - source: hosted - version: "5.0.1+1" - permission_handler_platform_interface: - dependency: transitive - description: - name: permission_handler_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" + version: "1.9.2" platform: dependency: transitive description: @@ -330,7 +246,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.3" process: dependency: transitive description: @@ -344,7 +260,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "4.3.1" + version: "4.3.3" rxdart: dependency: "direct main" description: @@ -352,27 +268,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.24.1" - sensors: - dependency: transitive - description: - name: sensors - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.2+2" - shake: - dependency: transitive - description: - name: shake - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.0" - share: - dependency: transitive - description: - name: share - url: "https://pub.dartlang.org" - source: hosted - version: "0.6.4+3" shared_preferences: dependency: "direct main" description: @@ -393,7 +288,7 @@ packages: name: shared_preferences_macos url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+10" + version: "0.0.1+11" shared_preferences_platform_interface: dependency: transitive description: @@ -426,21 +321,21 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0-nullsafety.2" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.5" + version: "1.10.0-nullsafety.1" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety.1" stream_transform: dependency: transitive description: @@ -454,63 +349,35 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0-nullsafety.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0-nullsafety.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.17" + version: "0.2.19-nullsafety.2" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0-nullsafety.3" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" - video_player: - dependency: transitive - description: - name: video_player - url: "https://pub.dartlang.org" - source: hosted - version: "0.10.11+2" - video_player_platform_interface: - dependency: transitive - description: - name: video_player_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2" - video_player_web: - dependency: transitive - description: - name: video_player_web - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.3+2" - wakelock: - dependency: transitive - description: - name: wakelock - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.4+2" + version: "2.1.0-nullsafety.3" win32: dependency: transitive description: @@ -524,7 +391,7 @@ packages: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.1.0" + version: "0.1.2" sdks: - dart: ">=2.9.0-14.0.dev <3.0.0" - flutter: ">=1.16.3 <2.0.0" + dart: ">=2.10.0 <2.11.0" + flutter: ">=1.20.0 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index e36bac8..a4046a6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,7 +36,6 @@ dependencies: dio: ^3.0.9 flutter_bloc: ^6.0.1 equatable: ^1.2.3 - alice: ^0.1.3 dev_dependencies: flutter_test: