♻️ refactor backend

BirjuVachhani · Aug 4, 2024 · 5bbe839 · 5bbe839
1 parent e0d4f8b
commit 5bbe839
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 20 deletions.
diff --git a/celest/lib/client.dart b/celest/lib/client.dart
@@ -23,7 +23,7 @@ enum CelestEnvironment {
         local => kIsWeb || !_$io.Platform.isAndroid
             ? Uri.parse('http://localhost:7777')
             : Uri.parse('http://10.0.2.2:7777'),
-        production => Uri.parse('https://pluto-7e6b20-v76lntiq7q-el.a.run.app'),
+        production => Uri.parse('https://pluto-fd3a2f-d4nrgles6q-el.a.run.app'),
       };
 }
 

diff --git a/lib/backend/backend_service.dart b/lib/backend/backend_service.dart
@@ -0,0 +1,11 @@
+import 'package:shared/shared.dart';
+import 'package:unsplash_client/unsplash_client.dart';
+
+abstract class BackendService {
+  Future<void> init({bool local = false});
+
+  Future<Photo?> randomUnsplashImage({
+    required UnsplashSource source,
+    required UnsplashPhotoOrientation orientation,
+  });
+}
diff --git a/lib/backend/celest_backend_service.dart b/lib/backend/celest_backend_service.dart
@@ -0,0 +1,34 @@
+import 'dart:developer';
+
+import 'package:celest_backend/client.dart';
+import 'package:shared/shared.dart';
+import 'package:unsplash_client/unsplash_client.dart';
+
+import 'backend_service.dart';
+
+class CelestBackendService extends BackendService {
+  @override
+  Future<void> init({bool local = false}) async {
+    // Initialize Celest at the start of your app
+    bool celestInitialized = false;
+
+    if (local) {
+      log('Initializing Celest with local server');
+      celest.init(environment: CelestEnvironment.local);
+      celestInitialized = true;
+    }
+
+    if (!celestInitialized) {
+      log('Initializing Celest with production server');
+      celest.init(environment: CelestEnvironment.production);
+    }
+  }
+
+  @override
+  Future<Photo?> randomUnsplashImage({
+    required UnsplashSource source,
+    required UnsplashPhotoOrientation orientation,
+  }) =>
+      celest.functions.unsplash
+          .randomUnsplashImage(source: source, orientation: orientation);
+}
diff --git a/lib/home/background_store.dart b/lib/home/background_store.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:developer';
 import 'dart:math' hide log;
 
-import 'package:celest_backend/client.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -15,6 +14,7 @@ import 'package:shared/shared.dart';
 import 'package:unsplash_client/unsplash_client.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+import '../backend/backend_service.dart';
 import '../model/background_settings.dart';
 import '../model/color_gradient.dart';
 import '../model/flat_color.dart';
@@ -116,6 +116,8 @@ abstract class _BackgroundStore with Store, LazyInitializationMixin {
   @readonly
   ObservableList<UnsplashSource> _customSources = ObservableList.of([]);
 
+  final BackendService backendService = GetIt.instance.get<BackendService>();
+
   @computed
   bool get isLiked {
     return currentImage != null &&
@@ -634,8 +636,7 @@ abstract class _BackgroundStore with Store, LazyInitializationMixin {
     final Size size = _imageResolution.toSize() ?? windowSize;
     switch (_imageSource) {
       case ImageSource.unsplash:
-        final Photo? photo =
-            await celest.functions.unsplash.randomUnsplashImage(
+        final Photo? photo = await backendService.randomUnsplashImage(
           source: _unsplashSource,
           orientation:
               UnsplashPhotoOrientation.fromAspectRatio(size.aspectRatio),

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,11 +1,10 @@
-import 'dart:developer';
-
-import 'package:celest_backend/client.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
+import 'backend/backend_service.dart';
+import 'backend/celest_backend_service.dart';
 import 'home/home.dart';
 import 'resources/colors.dart';
 import 'utils/geocoding_service.dart';
@@ -46,29 +45,29 @@ class MyApp extends StatelessWidget {
 }
 
 Future<void> initialize() async {
-  // Initialize Celest at the start of your app
-  bool celestInitialized = false;
-
-  if (useLocalServer) {
-    log('Initializing Celest with local server');
-    celest.init(environment: CelestEnvironment.local);
-    celestInitialized = true;
-  }
-
-  if (!celestInitialized) {
-    log('Initializing Celest with production server');
-    celest.init(environment: CelestEnvironment.production);
-  }
+  await initializeBackend();
 
   final storage = await SharedPreferencesStorageManager.create();
   GetIt.instance.registerSingleton<LocalStorageManager>(storage);
   GetIt.instance.registerSingleton<WeatherService>(OpenMeteoWeatherService());
   GetIt.instance
       .registerSingleton<GeocodingService>(OpenMeteoGeocodingService());
 
+  await GetIt.instance.allReady();
   await loadPackageInfo();
 }
 
+Future<void> initializeBackend() async {
+  // Initialize Celest
+  final BackendService service = await getBackend();
+
+  await service.init(local: useLocalServer);
+
+  GetIt.instance.registerSingleton<BackendService>(service);
+}
+
+BackendService getBackend() => CelestBackendService();
+
 ThemeData buildTheme(BuildContext context) {
   return ThemeData(
     colorScheme: ColorScheme.fromSeed(