Added TabsRepository + Bloc * ReactiveSharedPrefs * JSON generation *…

… renamed bloc methods

lib/di/containers.dart

@@ -2,6 +2,8 @@ import 'package:flutter_simple_dependency_injection/injector.dart';
 import 'package:hive/hive.dart';
 import 'package:keklist/domain/constants.dart';
 import 'package:keklist/domain/hive_constants.dart';
+import 'package:keklist/domain/repositories/tabs/tabs_settings_repository.dart';
+import 'package:keklist/domain/repositories/tabs/tabs_settings_shared_preferences_repository.dart';
 import 'package:keklist/domain/services/auth/auth_service.dart';
 import 'package:keklist/domain/repositories/mind/object/mind_object.dart';
 import 'package:keklist/domain/repositories/mind/mind_hive_repository.dart';
@@ -11,12 +13,18 @@ import 'package:keklist/domain/repositories/settings/settings_hive_repository.da
 import 'package:keklist/domain/repositories/settings/settings_repository.dart';
 import 'package:keklist/domain/services/mind_service/main_supabase_service.dart';
 import 'package:keklist/presentation/core/helpers/platform_utils.dart';
+import 'package:streaming_shared_preferences/streaming_shared_preferences.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:keklist/presentation/cubits/mind_searcher/mind_searcher_cubit.dart';
 import 'package:keklist/presentation/native/ios/watch/watch_communication_manager.dart';
 import 'package:keklist/domain/services/mind_service/main_service.dart';
 
 final class MainContainer {
+  final StreamingSharedPreferences _streamingSharedPreferences;
+
+  MainContainer({required StreamingSharedPreferences streamingSharedPreferences})
+      : _streamingSharedPreferences = streamingSharedPreferences;
+
   Injector initialize(Injector injector) {
     injector.map<MindService>(
       (injector) => MindSupabaseService(),
@@ -41,6 +49,9 @@ final class MainContainer {
     injector.map<SettingsRepository>(
       (injector) => SettingsHiveRepository(box: Hive.box<SettingsObject>(HiveConstants.settingsBoxName)),
     );
+    injector.map<TabsSettingsRepository>(
+      (injector) => TabsSettingsSharedPreferencesRepository(preferences: _streamingSharedPreferences),
+    );
     injector.map<AuthService>(
       (injector) => AuthSupabaseService(client: Supabase.instance.client),
     );

lib/domain/hive_constants.dart

@@ -1,6 +1,8 @@
 class HiveConstants {
   static const String settingsBoxName = 'settings_box';
   static const String globalSettingsIndex = 'global_settings';
+  static const String tabsSettingsBoxName = 'tabs_settings_box';
+  static const String tabsSettingsIndex = 'tabs_settings';
   static const String mindBoxName = 'mind_box';
   static const String mindQueueTransactionsBoxName = 'mind_queue_transactions_box';
   static const String messageChatBoxName = 'message_chat_box';

lib/domain/repositories/feature_flags/object/feature_flag_object.dart

@@ -1,10 +1,10 @@
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:keklist/domain/repositories/feature_flags/feature_flag_repository.dart';
-import 'package:keklist/presentation/core/enum_from_string.dart';
+import 'package:keklist/presentation/core/helpers/enum_utils.dart';
 
 part 'feature_flag_object.g.dart';
 
-@HiveType(typeId: 0)
+@HiveType(typeId: 4)
 final class FeatureFlagObject extends HiveObject {
   @HiveField(0, defaultValue: null)
   late String flagType;
@@ -13,7 +13,7 @@ final class FeatureFlagObject extends HiveObject {
   late bool value;
 
   FeatureFlagData? toFeatureFlagData() {
-    final FeatureFlagType? featureFlagType = enumFromString(
+    final FeatureFlagType? featureFlagType = EnumUtils.enumFromString(
       value: flagType,
       fromValues: FeatureFlagType.values,
     );

lib/domain/repositories/message/message/message_object.dart

@@ -1,5 +1,5 @@
 import 'package:hive/hive.dart';
-import 'package:keklist/presentation/core/enum_from_string.dart';
+import 'package:keklist/presentation/core/helpers/enum_utils.dart';
 import 'package:keklist/domain/services/entities/message.dart';
 
 part 'message_object.g.dart';
@@ -28,6 +28,6 @@ final class MessageObject extends HiveObject {
         text: text,
         rootMindId: rootMindId,
         timestamp: timestamp,
-        sender: enumFromString(value: sender, fromValues: MessageSender.values) ?? MessageSender.assistant,
+        sender: EnumUtils.enumFromString(value: sender, fromValues: MessageSender.values) ?? MessageSender.assistant,
       );
 }

lib/domain/repositories/tabs/models/tabs_settings.dart

@@ -0,0 +1,72 @@
+import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'tabs_settings.g.dart';
+
+@JsonSerializable()
+final class TabsSettings with EquatableMixin {
+  final List<TabModel> tabModels;
+  final int defaultSelectedTabIndex;
+
+  TabsSettings({
+    required this.tabModels,
+    required this.defaultSelectedTabIndex,
+  });
+
+  @override
+  List<Object?> get props => [
+        tabModels,
+        defaultSelectedTabIndex,
+      ];
+
+  @override
+  bool? get stringify => true;
+
+  // JsonSerializable
+  factory TabsSettings.fromJson(Map<String, dynamic> json) => _$TabsSettingsFromJson(json);
+  Map<String, dynamic> toJson() => _$TabsSettingsToJson(this);
+}
+
+@JsonSerializable()
+final class TabModel with EquatableMixin {
+  final TabType type;
+
+  TabModel({required this.type});
+
+  @override
+  List<Object?> get props => [type];
+
+  @override
+  bool? get stringify => true;
+
+  // JsonSerializable
+  factory TabModel.fromJson(Map<String, dynamic> json) => _$TabModelFromJson(json);
+  Map<String, dynamic> toJson() => _$TabModelToJson(this);
+}
+
+@JsonEnum()
+enum TabType implements Equatable {
+  calendar,
+  insights,
+  settings,
+  profile;
+
+  String get label {
+    switch (this) {
+      case TabType.calendar:
+        return 'Calendar';
+      case TabType.insights:
+        return 'Insights';
+      case TabType.settings:
+        return 'Settings';
+      case TabType.profile:
+        return 'Profile';
+    }
+  }
+
+  @override
+  List<Object?> get props => [this];
+
+  @override
+  bool? get stringify => true;
+}

lib/domain/repositories/tabs/tabs_settings_repository.dart

@@ -0,0 +1,11 @@
+import 'dart:async';
+
+import 'package:keklist/domain/repositories/tabs/models/tabs_settings.dart';
+
+abstract class TabsSettingsRepository {
+  TabsSettings get value;
+  Stream<TabsSettings> get stream;
+
+  FutureOr<void> updateTabList({required List<TabModel> tabList});
+  FutureOr<void> updateDefaultSelectedTabIndex({required List<TabModel> defaultSelectedTabIndex});
+}

lib/domain/repositories/tabs/tabs_settings_shared_preferences_repository.dart

@@ -0,0 +1,59 @@
+import 'dart:async';
+
+import 'package:keklist/domain/repositories/tabs/models/tabs_settings.dart';
+import 'package:keklist/domain/repositories/tabs/tabs_settings_repository.dart';
+import 'package:rxdart/rxdart.dart';
+import 'package:streaming_shared_preferences/streaming_shared_preferences.dart';
+
+final class TabsSettingsSharedPreferencesRepository extends TabsSettingsRepository {
+  final StreamingSharedPreferences _preferences;
+  final Preference<TabsSettings?> _tabsSettingsPreferences;
+  final BehaviorSubject<TabsSettings> _behaviorSubject = BehaviorSubject<TabsSettings>();
+
+  TabsSettingsSharedPreferencesRepository({required StreamingSharedPreferences preferences})
+      : _preferences = preferences,
+        _tabsSettingsPreferences = preferences.getCustomValue<TabsSettings?>(
+          'tabs_settings',
+          defaultValue: null,
+          adapter: JsonAdapter<TabsSettings>(
+            deserializer: (jsonObject) {
+              final Map<String, dynamic> json = (jsonObject as Map<String, dynamic>);
+              return TabsSettings.fromJson(json);
+            },
+          ),
+        ) {
+    _updateSettings(
+      TabsSettings(
+        defaultSelectedTabIndex: 0,
+        tabModels: [
+          TabModel(type: TabType.calendar),
+          TabModel(type: TabType.insights),
+          TabModel(type: TabType.profile),
+        ],
+      ),
+    );
+    _behaviorSubject.addStream(
+      _tabsSettingsPreferences.asBroadcastStream().whereNotNull().debounceTime(const Duration(milliseconds: 10)),
+    );
+  }
+
+  @override
+  Stream<TabsSettings> get stream => _behaviorSubject;
+
+  @override
+  TabsSettings get value => _behaviorSubject.value;
+
+  @override
+  FutureOr<void> updateDefaultSelectedTabIndex({required List<TabModel> defaultSelectedTabIndex}) {}
+
+  @override
+  FutureOr<void> updateTabList({required List<TabModel> tabList}) {}
+
+  FutureOr<void> _updateSettings(TabsSettings settings) async {
+    _preferences.setCustomValue(
+      'tabs_settings',
+      settings,
+      adapter: JsonAdapter<TabsSettings>(),
+    );
+  }
+}

lib/domain/services/entities/message.dart

@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:keklist/presentation/core/enum_from_string.dart';
+import 'package:keklist/presentation/core/helpers/enum_utils.dart';
 import 'package:keklist/domain/repositories/message/message/message_object.dart';
 
 class Message with EquatableMixin {
@@ -33,7 +33,7 @@ class Message with EquatableMixin {
     ..text = text
     ..rootMindId = rootMindId
     ..timestamp = timestamp
-    ..sender = stringFromEnum(sender);
+    ..sender = EnumUtils.stringFromEnum(sender);
 }
 
 enum MessageSender { user, system, assistant }

lib/keklist_app.dart

@@ -7,7 +7,7 @@ import 'package:keklist/presentation/core/helpers/bloc_utils.dart';
 import 'package:keklist/presentation/core/dispose_bag.dart';
 import 'package:keklist/presentation/core/screen/kek_screen_state.dart';
 import 'package:keklist/presentation/core/widgets/sensitive_widget.dart';
-import 'package:keklist/presentation/screens/tab_container/tab_container_screen.dart';
+import 'package:keklist/presentation/screens/tabs_container/tabs_container_screen.dart';
 
 final class KeklistApp extends StatefulWidget {
   const KeklistApp({super.key});
@@ -23,7 +23,7 @@ final class KeklistAppState extends KekWidgetState<KeklistApp> {
   void initState() {
     super.initState();
 
-    subscribeTo<SettingsBloc>(
+    subscribeToBloc<SettingsBloc>(
       onNewState: (state) {
         if (state is SettingsDataState) {
           if (state.settings.openAIKey != null) {
@@ -42,7 +42,7 @@ final class KeklistAppState extends KekWidgetState<KeklistApp> {
   Widget build(BuildContext context) {
     return MaterialApp(
       title: 'Keklist',
-      home: const TabContainerScreen(),
+      home: const TabsContainerScreen(),
       theme: _isDarkMode ? Themes.dark : Themes.light,
       darkTheme: Themes.dark,
       themeMode: ThemeMode.light,

lib/main.dart

@@ -8,6 +8,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_simple_dependency_injection/injector.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
 import 'package:hive_flutter/hive_flutter.dart';
+import 'package:keklist/domain/repositories/tabs/tabs_settings_repository.dart';
 // import 'package:home_widget/home_widget.dart';
 // import 'package:home_widget/home_widget.dart';
 import 'package:keklist/domain/services/auth/auth_service.dart';
@@ -19,9 +20,11 @@ import 'package:keklist/domain/hive_constants.dart';
 import 'package:keklist/domain/repositories/message/message/message_object.dart';
 import 'package:keklist/domain/repositories/settings/object/settings_object.dart';
 import 'package:keklist/native/web/telegram/telegram_web_initializer.dart';
-import 'package:keklist/presentation/blocs/tab_container_bloc/tab_container_bloc.dart';
+import 'package:keklist/presentation/blocs/tabs_container_bloc/tabs_container_bloc.dart';
+import 'package:keklist/presentation/blocs/tabs_container_bloc/tabs_container_state.dart';
 import 'package:keklist/presentation/blocs/user_profile_bloc/user_profile_bloc.dart';
 import 'package:provider/provider.dart';
+import 'package:streaming_shared_preferences/streaming_shared_preferences.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:keklist/presentation/blocs/auth_bloc/auth_bloc.dart';
 import 'package:flutter/foundation.dart';
@@ -49,9 +52,12 @@ Future<void> main() async {
   await _initHive();
   await _initSupabase();
 
+  final StreamingSharedPreferences streamingSharedPreferences = await StreamingSharedPreferences.instance;
+
   // Инициализация DI-контейнера.
   final Injector injector = Injector();
-  final Injector mainInjector = MainContainer().initialize(injector);
+  final Injector mainInjector =
+      MainContainer(streamingSharedPreferences: streamingSharedPreferences).initialize(injector);
 
   _connectToWatchCommunicationManager(mainInjector);
   _enableDebugBLOCLogs();
@@ -127,7 +133,9 @@ Widget _getApplication(Injector mainInjector) => MultiProvider(
             ),
           ),
           BlocProvider(
-            create: (context) => TabContainerBloc(),
+            create: (context) => TabsContainerBloc(
+              repository: mainInjector.get<TabsSettingsRepository>(),
+            ),
           ),
         ],
         child: const KeklistApp(),
@@ -141,7 +149,7 @@ void _initNativeWidgets() {
 void _setupBlockingLoadingWidget() {
   EasyLoading.instance
     ..displayDuration = const Duration(milliseconds: 10000)
-    ..indicatorType = EasyLoadingIndicatorType.doubleBounce
+    ..indicatorType = EasyLoadingIndicatorType.pouringHourGlass
     ..loadingStyle = EasyLoadingStyle.light
     ..indicatorSize = 45.0
     ..radius = 10.0