Merge pull request #16 from Jeremiahandsome/main

release room v4.0.1 and atomic-x v4.0.0

Author: AbySwifter

application/pubspec.yaml

@@ -50,6 +50,11 @@ dependencies:
   tencent_chat_uikit:
     path: ../chat/uikit
 
+# Temporary solution, to be removed after the release of chat/live
+dependency_overrides: 
+  atomic_x_core: 4.0.0
+  rtc_room_engine: 4.0.0
+
 dev_dependencies:
   flutter_test:
     sdk: flutter

atomic-x/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.0.0
+* Adapted for atomic_x_core 4.0.0.
+
 ## 3.6.6
 * Fixed the conflict issue on the iOS platform after using the third-party library file_picker.
 * Removed dependencies on certain third-party libraries.

atomic-x/call_assets/loading.gif

@@ -65,6 +65,7 @@ class AppBuilder {
 
   static Future<void> init({required String path}) async {
     final instance = getInstance();
+    await StorageUtil.init();
     await instance._loadConfig(path: path);
   }
 
@@ -136,23 +137,31 @@ class MessageListConfig {
   final String alignment;
   final List<String> messageActionList;
   final bool _jsonEnableReadReceipt;
+  bool? _cachedEnableReadReceipt;
 
   MessageListConfig({
     required this.alignment,
     required this.messageActionList,
     required bool jsonEnableReadReceipt,
-  }) : _jsonEnableReadReceipt = jsonEnableReadReceipt;
+  }) : _jsonEnableReadReceipt = jsonEnableReadReceipt {
+    // Load cached value asynchronously
+    _loadEnableReadReceipt();
+  }
 
-  bool get enableReadReceipt {
-    final value = StorageUtil.get(_enableReadReceiptKey);
-    if (value is bool) {
-      return value;
-    }
+  void _loadEnableReadReceipt() {
+    StorageUtil.get(_enableReadReceiptKey).then((value) {
+      if (value is bool) {
+        _cachedEnableReadReceipt = value;
+      }
+    });
+  }
 
-    return _jsonEnableReadReceipt;
+  bool get enableReadReceipt {
+    return _cachedEnableReadReceipt ?? _jsonEnableReadReceipt;
   }
 
-  Future<bool> setEnableReadReceipt(bool value) {
+  Future<bool> setEnableReadReceipt(bool value) async {
+    _cachedEnableReadReceipt = value;
     return StorageUtil.set(_enableReadReceiptKey, value);
   }
 
@@ -285,20 +294,34 @@ class AvatarConfig {
 
 class TranslateConfig {
   static const String _translateTargetLanguageKey = 'atomic_translate_target_language';
+  String? _cachedTargetLanguage;
+
+  TranslateConfig() {
+    // Load cached value asynchronously
+    _loadTargetLanguage();
+  }
+
+  void _loadTargetLanguage() {
+    StorageUtil.get(_translateTargetLanguageKey).then((value) {
+      if (value is String && value.isNotEmpty) {
+        _cachedTargetLanguage = value;
+      }
+    });
+  }
 
   /// Get translate target language
   /// Returns saved language or device language as default
   String get targetLanguage {
-    final saved = StorageUtil.get(_translateTargetLanguageKey);
-    if (saved is String && saved.isNotEmpty) {
-      return saved;
+    if (_cachedTargetLanguage != null && _cachedTargetLanguage!.isNotEmpty) {
+      return _cachedTargetLanguage!;
     }
     // Return device language as default
     return PlatformDispatcher.instance.locale.languageCode;
   }
 
   /// Set translate target language
-  Future<bool> setTargetLanguage(String languageCode) {
+  Future<bool> setTargetLanguage(String languageCode) async {
+    _cachedTargetLanguage = languageCode;
     return StorageUtil.set(_translateTargetLanguageKey, languageCode);
   }
 }

atomic-x/lib/base_component/utils/app_builder.dart

@@ -4,9 +4,26 @@ import 'package:tuikit_atomic_x/base_component/base_component.dart';
 class LocaleProvider extends ChangeNotifier {
   String? _locale;
 
+  LocaleProvider() {
+    // Load cached locale value asynchronously
+    _loadLocale();
+  }
+
+  void _loadLocale() {
+    StorageUtil.get('locale').then((value) {
+      if (value is String) {
+        _locale = value;
+      } else {
+        _locale = "system";
+      }
+
+      notifyListeners();
+    });
+  }
+
   Locale? get locale {
-    _locale = (StorageUtil.get('locale') as String?) ?? "system";
-    switch (_locale) {
+    final localeValue = _locale ?? "system";
+    switch (localeValue) {
       case 'ar':
         return const Locale('ar');
       case 'en':

atomic-x/lib/base_component/utils/locale_provider.dart

@@ -10,11 +10,8 @@ class StorageUtil {
     _preferences = await SharedPreferences.getInstance();
   }
 
-  static Future<bool> set<T>(String key, T value) {
-    if (_preferences == null) {
-      debugPrint('StorageUtil, need call await init() first');
-      return Future.value(false);
-    }
+  static Future<bool> set<T>(String key, T value) async {
+    _preferences ??= await SharedPreferences.getInstance();
 
     String type = value.runtimeType.toString();
     switch (type) {
@@ -31,25 +28,19 @@ class StorageUtil {
       case "_InternalLinkedHashMap<String, String>":
         return _preferences!.setString(key, json.encode(value));
       default:
-        return Future.value(false);
+        return false;
     }
   }
 
-  static Object? get(String key) {
-    if (_preferences == null) {
-      debugPrint('StorageUtil, need call await init() first');
-      return null;
-    }
+  static Future<Object?> get(String key) async {
+    _preferences ??= await SharedPreferences.getInstance();
 
     Object? value = _preferences!.get(key);
     return value;
   }
 
-  static Future<bool> remove(String key) {
-    if (_preferences == null) {
-      debugPrint('StorageUtil, need call await init() first');
-      return Future.value(false);
-    }
+  static Future<bool> remove(String key) async {
+    _preferences ??= await SharedPreferences.getInstance();
 
     return _preferences!.remove(key);
   }

atomic-x/lib/base_component/utils/storage_util.dart

@@ -117,7 +117,7 @@ class _AddFriendState extends State<AddFriend> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(_showAddFriendDetail ? atomicLocale.addFriend : atomicLocale.addFriend),
+        title: Text(atomicLocale.addFriend, style: TextStyle(color: colorsTheme.textColorPrimary)),
         backgroundColor: colorsTheme.bgColorOperate,
         scrolledUnderElevation: 0,
         leading: IconButton.buttonContent(

atomic-x/lib/contact_list/pages/add_friend.dart

@@ -118,7 +118,7 @@ class _AddGroupState extends State<AddGroup> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(_showJoinGroupDetail ? atomicLocale.addGroup : atomicLocale.addGroup),
+        title: Text(atomicLocale.addGroup, style: TextStyle(color: colorsTheme.textColorPrimary)),
         backgroundColor: colorsTheme.bgColorOperate,
         elevation: 0,
         leading: IconButton.buttonContent(

atomic-x/lib/contact_list/pages/add_group.dart

@@ -44,6 +44,7 @@ class _BlacklistState extends State<Blacklist> {
     final colorsTheme = BaseThemeProvider.colorsOf(context);
 
     return Scaffold(
+      backgroundColor: colorsTheme.bgColorOperate,
       appBar: AppBar(
         backgroundColor: colorsTheme.bgColorOperate,
         scrolledUnderElevation: 0,

atomic-x/lib/contact_list/pages/blacklist.dart

@@ -42,6 +42,7 @@ class _GroupListState extends State<GroupList> {
     final colorsTheme = BaseThemeProvider.colorsOf(context);
 
     return Scaffold(
+      backgroundColor: colorsTheme.bgColorOperate,
       appBar: AppBar(
         backgroundColor: colorsTheme.bgColorOperate,
         scrolledUnderElevation: 0,