From 927eb3c4518673bbf85d0191383f39b6753f30ca Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Fri, 28 May 2021 10:35:13 +0530 Subject: [PATCH] extract location outside of client options Signed-off-by: Sahil Kumar --- packages/stream_chat/lib/src/client.dart | 1 + .../lib/src/core/http/stream_http_client.dart | 1 + .../core/http/stream_http_client_options.dart | 30 ------------------- packages/stream_chat/lib/src/location.dart | 29 ++++++++++++++++++ packages/stream_chat/lib/stream_chat.dart | 9 +++--- 5 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 packages/stream_chat/lib/src/location.dart diff --git a/packages/stream_chat/lib/src/client.dart b/packages/stream_chat/lib/src/client.dart index d008e211..cd986b2e 100644 --- a/packages/stream_chat/lib/src/client.dart +++ b/packages/stream_chat/lib/src/client.dart @@ -7,6 +7,7 @@ import 'package:dio/dio.dart'; import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; import 'package:stream_chat/src/api/channel.dart'; +import 'package:stream_chat/src/location.dart'; import 'package:stream_chat/src/ws/connection_status.dart'; import 'package:stream_chat/src/core/api/attachment_file_uploader.dart'; import 'package:stream_chat/src/core/api/requests.dart'; diff --git a/packages/stream_chat/lib/src/core/http/stream_http_client.dart b/packages/stream_chat/lib/src/core/http/stream_http_client.dart index e5c1e82b..d814d705 100644 --- a/packages/stream_chat/lib/src/core/http/stream_http_client.dart +++ b/packages/stream_chat/lib/src/core/http/stream_http_client.dart @@ -9,6 +9,7 @@ import 'package:stream_chat/src/core/http/interceptor/logging_interceptor.dart'; import 'package:stream_chat/src/core/http/stream_chat_dio_error.dart'; import 'package:stream_chat/src/core/http/token_manager.dart'; import 'package:stream_chat/src/errors/stream_chat_error.dart'; +import 'package:stream_chat/src/location.dart'; import 'package:stream_chat/src/platform_detector/platform_detector.dart'; import 'package:stream_chat/version.dart'; diff --git a/packages/stream_chat/lib/src/core/http/stream_http_client_options.dart b/packages/stream_chat/lib/src/core/http/stream_http_client_options.dart index 0f06e4d0..faad46a1 100644 --- a/packages/stream_chat/lib/src/core/http/stream_http_client_options.dart +++ b/packages/stream_chat/lib/src/core/http/stream_http_client_options.dart @@ -1,35 +1,5 @@ part of 'stream_http_client.dart'; -/// -enum Location { - /// - usEast, - - /// - euWest, - - /// - mumbai, - - /// - sydney, - - /// - singapore, -} - -/// -extension LocationX on Location { - /// - String get name => { - Location.usEast: 'us-east', - Location.euWest: 'dublin', - Location.mumbai: 'mumbai', - Location.sydney: 'sydney', - Location.singapore: 'singapore', - }[this]!; -} - const _defaultBaseURL = 'https://chat-us-east-1.stream-io-api.com'; /// Client options to modify [StreamHttpClient] diff --git a/packages/stream_chat/lib/src/location.dart b/packages/stream_chat/lib/src/location.dart new file mode 100644 index 00000000..86813a0a --- /dev/null +++ b/packages/stream_chat/lib/src/location.dart @@ -0,0 +1,29 @@ +/// +enum Location { + /// + usEast, + + /// + euWest, + + /// + mumbai, + + /// + sydney, + + /// + singapore, +} + +/// +extension LocationX on Location { + /// + String get name => { + Location.usEast: 'us-east', + Location.euWest: 'dublin', + Location.mumbai: 'mumbai', + Location.sydney: 'sydney', + Location.singapore: 'singapore', + }[this]!; +} diff --git a/packages/stream_chat/lib/stream_chat.dart b/packages/stream_chat/lib/stream_chat.dart index de49dcdd..991e721b 100644 --- a/packages/stream_chat/lib/stream_chat.dart +++ b/packages/stream_chat/lib/stream_chat.dart @@ -11,6 +11,9 @@ export './src/api/channel.dart'; export './src/client.dart'; export './src/core/api/attachment_file_uploader.dart' show AttachmentFileUploader; +export './src/core/api/requests.dart'; +export './src/core/api/requests.dart'; +export './src/core/api/responses.dart'; export './src/core/models/action.dart'; export './src/core/models/attachment.dart'; export './src/core/models/attachment_file.dart'; @@ -33,7 +36,5 @@ export './src/event_type.dart'; export './src/exceptions.dart'; export './src/extensions/rate_limit.dart'; export './src/extensions/string_extension.dart'; -export 'src/core/api/requests.dart'; -export 'src/core/api/requests.dart'; -export 'src/core/api/responses.dart'; -export 'src/ws/connection_status.dart'; +export './src/location.dart'; +export './src/ws/connection_status.dart';