From d9daaeef9f52f618d37458f8ece89e67925bf213 Mon Sep 17 00:00:00 2001 From: vishnukvmd Date: Wed, 7 Dec 2022 07:04:50 +0530 Subject: [PATCH] Replace Configuration with LocalSettings --- lib/core/configuration.dart | 13 ------------- lib/ui/advanced_settings_screen.dart | 8 ++++---- lib/ui/huge_listview/lazy_loading_gallery.dart | 6 +++--- lib/utils/local_settings.dart | 15 +++++++++++++++ 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/lib/core/configuration.dart b/lib/core/configuration.dart index 3bed11949..685cf4416 100644 --- a/lib/core/configuration.dart +++ b/lib/core/configuration.dart @@ -59,7 +59,6 @@ class Configuration { static const keyAttributesKey = "key_attributes"; static const keyKey = "key"; static const keyShouldBackupOverMobileData = "should_backup_over_mobile_data"; - static const keyAlbumGridSize = "album_grid_size"; static const keyShouldBackupVideos = "should_backup_videos"; // keyShouldKeepDeviceAwake is used to determine whether the device screen @@ -561,18 +560,6 @@ class Configuration { } } - int getAlbumGridSize() { - if (_preferences.containsKey(keyAlbumGridSize)) { - return _preferences.getInt(keyAlbumGridSize)!; - } else { - return defaultAlbumGridSize; - } - } - - Future setAlbumGridSize(int value) async { - await _preferences.setInt(keyAlbumGridSize, value); - } - Future setBackupOverMobileData(bool value) async { await _preferences.setBool(keyShouldBackupOverMobileData, value); if (value) { diff --git a/lib/ui/advanced_settings_screen.dart b/lib/ui/advanced_settings_screen.dart index e3f6192bb..20a641ae9 100644 --- a/lib/ui/advanced_settings_screen.dart +++ b/lib/ui/advanced_settings_screen.dart @@ -1,6 +1,5 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:photos/core/configuration.dart'; import 'package:photos/core/event_bus.dart'; import 'package:photos/ente_theme_data.dart'; import 'package:photos/events/force_reload_home_gallery_event.dart'; @@ -10,6 +9,7 @@ import 'package:photos/ui/components/icon_button_widget.dart'; import 'package:photos/ui/components/menu_item_widget.dart'; import 'package:photos/ui/components/title_bar_title_widget.dart'; import 'package:photos/ui/components/title_bar_widget.dart'; +import 'package:photos/utils/local_settings.dart'; class AdvancedSettingsScreen extends StatefulWidget { const AdvancedSettingsScreen({super.key}); @@ -20,11 +20,10 @@ class AdvancedSettingsScreen extends StatefulWidget { class _AdvancedSettingsScreenState extends State { late int _albumGridSize, _chosenGridSize; - final _config = Configuration.instance; @override void initState() { - _albumGridSize = _config.getAlbumGridSize(); + _albumGridSize = LocalSettings.instance.getAlbumGridSize(); _chosenGridSize = _albumGridSize; super.initState(); } @@ -151,7 +150,8 @@ class _AdvancedSettingsScreenState extends State { ), CupertinoButton( onPressed: () async { - await _config.setAlbumGridSize(_chosenGridSize); + await LocalSettings.instance + .setAlbumGridSize(_chosenGridSize); Bus.instance.fire( ForceReloadHomeGalleryEvent("grid size changed"), ); diff --git a/lib/ui/huge_listview/lazy_loading_gallery.dart b/lib/ui/huge_listview/lazy_loading_gallery.dart index a2923eb10..a61d4fcee 100644 --- a/lib/ui/huge_listview/lazy_loading_gallery.dart +++ b/lib/ui/huge_listview/lazy_loading_gallery.dart @@ -7,7 +7,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:logging/logging.dart'; -import 'package:photos/core/configuration.dart'; import 'package:photos/core/constants.dart'; import 'package:photos/core/event_bus.dart'; import 'package:photos/events/clear_selections_event.dart'; @@ -20,6 +19,7 @@ import 'package:photos/ui/viewer/file/detail_page.dart'; import 'package:photos/ui/viewer/file/thumbnail_widget.dart'; import 'package:photos/ui/viewer/gallery/gallery.dart'; import 'package:photos/utils/date_time_util.dart'; +import 'package:photos/utils/local_settings.dart'; import 'package:photos/utils/navigation_util.dart'; import 'package:visibility_detector/visibility_detector.dart'; @@ -388,7 +388,7 @@ class _LazyLoadingGridViewState extends State { gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisSpacing: 2, mainAxisSpacing: 2, - crossAxisCount: Configuration.instance.getAlbumGridSize(), + crossAxisCount: LocalSettings.instance.getAlbumGridSize(), ), padding: const EdgeInsets.all(0), ); @@ -426,7 +426,7 @@ class _LazyLoadingGridViewState extends State { serverLoadDeferDuration: thumbnailServerLoadDeferDuration, shouldShowLivePhotoOverlay: true, key: Key(widget.tag + file.tag), - thumbnailSize: Configuration.instance.getAlbumGridSize() < + thumbnailSize: LocalSettings.instance.getAlbumGridSize() < defaultAlbumGridSize ? thumbnailLargeSize : thumbnailSmallSize, diff --git a/lib/utils/local_settings.dart b/lib/utils/local_settings.dart index 790d7a3b5..08238b235 100644 --- a/lib/utils/local_settings.dart +++ b/lib/utils/local_settings.dart @@ -1,3 +1,4 @@ +import 'package:photos/core/constants.dart'; import 'package:shared_preferences/shared_preferences.dart'; enum AlbumSortKey { @@ -11,6 +12,8 @@ class LocalSettings { static final LocalSettings instance = LocalSettings._privateConstructor(); static const kCollectionSortPref = "collection_sort_pref"; + static const keyAlbumGridSize = "album_grid_size"; + late SharedPreferences _prefs; void init(SharedPreferences preferences) { @@ -24,4 +27,16 @@ class LocalSettings { Future setAlbumSortKey(AlbumSortKey key) { return _prefs.setInt(kCollectionSortPref, key.index); } + + int getAlbumGridSize() { + if (_prefs.containsKey(keyAlbumGridSize)) { + return _prefs.getInt(keyAlbumGridSize)!; + } else { + return defaultAlbumGridSize; + } + } + + Future setAlbumGridSize(int value) async { + await _prefs.setInt(keyAlbumGridSize, value); + } }