🚀 Launch 1.2.1+40

✨ Notification preferences
✨ Realm avatar, banner
2024-09-17 16:02:13 +08:00 · 2024-09-17 15:59:17 +08:00 · 2024-09-17 14:21:37 +08:00 · 2024-09-17 13:50:04 +08:00 · 2024-09-17 13:39:08 +08:00
21 changed files with 447 additions and 79 deletions
--- a/assets/locales/en_us.json
+++ b/assets/locales/en_us.json
@@ -228,6 +228,8 @@
  "realmDescription": "Description",
  "realmPublic": "Public Realm",
  "realmCommunity": "Community Realm",
+  "realmAvatar": "Realm avatar",
+  "realmBanner": "Realm banner",
  "realmDetail": "Realm detail",
  "realmMember": "Realm member",
  "realmMembers": "Realm members",
@@ -253,7 +255,8 @@
  "channelName": "Name",
  "channelDescription": "Description",
  "channelDirectDescription": "Direct message with @username",
-  "channelEncrypted": "Encrypted Channel",
+  "channelPublic": "Public channel",
+  "channelCommunity": "Community channel",
  "channelMember": "Channel member",
  "channelMembers": "Channel members",
  "channelMembersAdd": "Add channel members",
@@ -413,5 +416,11 @@
  "holdToSeeDetail": "Long press / Mouse hover to see detail",
  "subscribe": "Subscribe",
  "subscribed": "Subscribed",
-  "unsubscribe": "Unsubscribe"
+  "unsubscribe": "Unsubscribe",
+  "preferences": "Preferences",
+  "notificationPreferences": "Notification preferences",
+  "notificationTopicPostFeedback": "Post feedbacks",
+  "notificationTopicPostSubscription": "Post subscriptions",
+  "preferencesApplied": "Preferences has been applied.",
+  "save": "Save"
 }
--- a/assets/locales/zh_cn.json
+++ b/assets/locales/zh_cn.json
@@ -229,6 +229,8 @@
  "realmDescription": "领域简介",
  "realmPublic": "公开领域",
  "realmCommunity": "社区领域",
+  "realmAvatar": "领域头像",
+  "realmBanner": "领域横幅",
  "realmDetail": "领域详情",
  "realmMember": "领域成员",
  "realmMembers": "领域成员",
@@ -254,7 +256,8 @@
  "channelName": "显示名称",
  "channelDescription": "频道简介",
  "channelDirectDescription": "与 @username 的私聊",
-  "channelEncrypted": "加密频道",
+  "channelPublic": "公开频道",
+  "channelCommunity": "社区频道",
  "channelMember": "频道成员",
  "channelMembers": "频道成员",
  "channelMembersAdd": "添加频道成员",
@@ -414,5 +417,11 @@
  "holdToSeeDetail": "长按 / 鼠标悬浮来查看详情",
  "subscribe": "订阅",
  "subscribed": "已订阅",
-  "unsubscribe": "取消订阅"
+  "unsubscribe": "取消订阅",
+  "preferences": "偏好设置",
+  "notificationPreferences": "通知偏好设置",
+  "notificationTopicPostFeedback": "帖子反馈",
+  "notificationTopicPostSubscription": "订阅源",
+  "preferencesApplied": "偏好设置已应用",
+  "save": "保存"
 }
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -73,7 +73,7 @@ PODS:
    - Firebase/Performance (= 11.0.0)
    - firebase_core
    - Flutter
-  - FirebaseABTesting (11.1.0):
+  - FirebaseABTesting (11.2.0):
    - FirebaseCore (~> 11.0)
  - FirebaseAnalytics (11.0.0):
    - FirebaseAnalytics/AdIdSupport (= 11.0.0)
@@ -97,9 +97,9 @@ PODS:
    - FirebaseCoreInternal (~> 11.0)
    - GoogleUtilities/Environment (~> 8.0)
    - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreExtension (11.1.0):
+  - FirebaseCoreExtension (11.2.0):
    - FirebaseCore (~> 11.0)
-  - FirebaseCoreInternal (11.1.0):
+  - FirebaseCoreInternal (11.2.0):
    - "GoogleUtilities/NSData+zlib (~> 8.0)"
  - FirebaseCrashlytics (11.0.0):
    - FirebaseCore (~> 11.0)
@@ -110,7 +110,7 @@ PODS:
    - GoogleUtilities/Environment (~> 8.0)
    - nanopb (~> 3.30910.0)
    - PromisesObjC (~> 2.4)
-  - FirebaseInstallations (11.1.0):
+  - FirebaseInstallations (11.2.0):
    - FirebaseCore (~> 11.0)
    - GoogleUtilities/Environment (~> 8.0)
    - GoogleUtilities/UserDefaults (~> 8.0)
@@ -134,7 +134,7 @@ PODS:
    - GoogleUtilities/MethodSwizzler (~> 8.0)
    - GoogleUtilities/UserDefaults (~> 8.0)
    - nanopb (~> 3.30910.0)
-  - FirebaseRemoteConfig (11.1.0):
+  - FirebaseRemoteConfig (11.2.0):
    - FirebaseABTesting (~> 11.0)
    - FirebaseCore (~> 11.0)
    - FirebaseInstallations (~> 11.0)
@@ -142,8 +142,8 @@ PODS:
    - FirebaseSharedSwift (~> 11.0)
    - GoogleUtilities/Environment (~> 8.0)
    - "GoogleUtilities/NSData+zlib (~> 8.0)"
-  - FirebaseRemoteConfigInterop (11.1.0)
-  - FirebaseSessions (11.1.0):
+  - FirebaseRemoteConfigInterop (11.2.0)
+  - FirebaseSessions (11.2.0):
    - FirebaseCore (~> 11.0)
    - FirebaseCoreExtension (~> 11.0)
    - FirebaseInstallations (~> 11.0)
@@ -152,7 +152,7 @@ PODS:
    - GoogleUtilities/UserDefaults (~> 8.0)
    - nanopb (~> 3.30910.0)
    - PromisesSwift (~> 2.1)
-  - FirebaseSharedSwift (11.1.0)
+  - FirebaseSharedSwift (11.2.0)
  - Flutter (1.0.0)
  - flutter_background_service_ios (0.0.3):
    - Flutter
@@ -450,19 +450,19 @@ SPEC CHECKSUMS:
  firebase_crashlytics: 4111f8198b78c99471c955af488cecd8224967e6
  firebase_messaging: c40f84e7a98da956d5262fada373b5c458edcf13
  firebase_performance: 8b7b9ca5adf3a9b3afa12b4eb96b9cabefc2c248
-  FirebaseABTesting: c2e22c3aab99afa81d0561708b2c1c356c556976
+  FirebaseABTesting: 2104d957ce33888a3d6f3bde298cdee376dde8f1
  FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a
  FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383
-  FirebaseCoreExtension: aa5c9779c2d0d39d83f1ceb3fdbafe80c4feecfa
-  FirebaseCoreInternal: adefedc9a88dbe393c4884640a73ec9e8e790f8c
+  FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de
+  FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5
  FirebaseCrashlytics: 745d8f0221fe49c62865391d1bf56f5a12eeec0b
-  FirebaseInstallations: d0a8fea5a6fa91abc661591cf57c0f0d70863e57
+  FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a
  FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742
  FirebasePerformance: efdc02bacb1b4710588c9f867011605c081cdf79
-  FirebaseRemoteConfig: 05521e937b72e01847a7128da5a492327364c705
-  FirebaseRemoteConfigInterop: abf8b1bbc0bf1b84abd22b66746926410bf91a87
-  FirebaseSessions: 78f137e68dc01ca71606169ba4ac73b98c13752a
-  FirebaseSharedSwift: 260a35e08943ec810d820a70bc0359136351d0c5
+  FirebaseRemoteConfig: fca0b2d017fc1de52b28a4e5bcf2007c1a840457
+  FirebaseRemoteConfigInterop: 477b26fdeb8fb5fbaf22fa9db5343b42289dc7db
+  FirebaseSessions: adcec8b72d0066a385e3affcd1bcb1ebb3908ce6
+  FirebaseSharedSwift: 7a0d78d155ede78407f0fdc89fbc914014c7c540
  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
  flutter_background_service_ios: e30e0d3ee69e4cee66272d0c78eacd48c2e94aac
  flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -616,6 +616,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -920,6 +921,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -947,6 +949,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
--- a/lib/models/channel.dart
+++ b/lib/models/channel.dart
@@ -19,7 +19,8 @@ class Channel {
  int accountId;
  Realm? realm;
  int? realmId;
-  bool isEncrypted;
+  bool isPublic;
+  bool isCommunity;

  @JsonKey(includeFromJson: false, includeToJson: true)
  bool isAvailable = false;
@@ -36,7 +37,8 @@ class Channel {
    required this.members,
    required this.account,
    required this.accountId,
-    required this.isEncrypted,
+    required this.isPublic,
+    required this.isCommunity,
    required this.realm,
    required this.realmId,
  });
--- a/lib/models/channel.g.dart
+++ b/lib/models/channel.g.dart
@@ -22,7 +22,8 @@ Channel _$ChannelFromJson(Map<String, dynamic> json) => Channel(
          .toList(),
      account: Account.fromJson(json['account'] as Map<String, dynamic>),
      accountId: (json['account_id'] as num).toInt(),
-      isEncrypted: json['is_encrypted'] as bool,
+      isPublic: json['is_public'] as bool,
+      isCommunity: json['is_community'] as bool,
      realm: json['realm'] == null
          ? null
          : Realm.fromJson(json['realm'] as Map<String, dynamic>),
@@ -43,7 +44,8 @@ Map<String, dynamic> _$ChannelToJson(Channel instance) => <String, dynamic>{
      'account_id': instance.accountId,
      'realm': instance.realm?.toJson(),
      'realm_id': instance.realmId,
-      'is_encrypted': instance.isEncrypted,
+      'is_public': instance.isPublic,
+      'is_community': instance.isCommunity,
      'is_available': instance.isAvailable,
    };

--- a/lib/router.dart
+++ b/lib/router.dart
@@ -5,7 +5,8 @@ import 'package:solian/models/realm.dart';
 import 'package:solian/screens/about.dart';
 import 'package:solian/screens/account.dart';
 import 'package:solian/screens/account/friend.dart';
-import 'package:solian/screens/account/personalize.dart';
+import 'package:solian/screens/account/preferences/notifications.dart';
+import 'package:solian/screens/account/profile_edit.dart';
 import 'package:solian/screens/account/profile_page.dart';
 import 'package:solian/screens/auth/signin.dart';
 import 'package:solian/screens/auth/signup.dart';
@@ -245,6 +246,14 @@ abstract class AppRouter {
          child: const PersonalizeScreen(),
        ),
      ),
+      GoRoute(
+        path: '/account/preferences/notifications',
+        name: 'notificationPreferences',
+        builder: (context, state) => TitleShell(
+          state: state,
+          child: const NotificationPreferencesScreen(),
+        ),
+      ),
      GoRoute(
        path: '/account/view/:name',
        name: 'accountProfilePage',
--- a/lib/screens/account.dart
+++ b/lib/screens/account.dart
@@ -131,6 +131,15 @@ class _AccountScreenState extends State<AccountScreen> {
                    AppRouter.instance.pushNamed('settings');
                  },
                ),
+                if (auth.isAuthorized.value)
+                  ListTile(
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 34),
+                    leading: const Icon(Icons.edit_notifications),
+                    title: Text('notificationPreferences'.tr),
+                    onTap: () {
+                      AppRouter.instance.pushNamed('notificationPreferences');
+                    },
+                  ),
                const Divider(thickness: 0.3, height: 1)
                    .paddingSymmetric(vertical: 4),
                ListTile(
--- a/lib/screens/account/preferences/notifications.dart
+++ b/lib/screens/account/preferences/notifications.dart
@@ -0,0 +1,118 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_animate/flutter_animate.dart';
+import 'package:get/get.dart';
+import 'package:get/get_connect/http/src/exceptions/exceptions.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:solian/exceptions/request.dart';
+import 'package:solian/exts.dart';
+import 'package:solian/providers/auth.dart';
+
+class NotificationPreferencesScreen extends StatefulWidget {
+  const NotificationPreferencesScreen({super.key});
+
+  @override
+  State<NotificationPreferencesScreen> createState() =>
+      _NotificationPreferencesScreenState();
+}
+
+class _NotificationPreferencesScreenState
+    extends State<NotificationPreferencesScreen> {
+  bool _isBusy = true;
+
+  Map<String, bool> _config = {};
+
+  final Map<String, String> _topicMap = {
+    'interactive.feedback': 'notificationTopicPostFeedback'.tr,
+    'interactive.subscription': 'notificationTopicPostSubscription'.tr,
+  };
+
+  Future<void> _getPreferences() async {
+    setState(() => _isBusy = true);
+
+    final auth = Get.find<AuthProvider>();
+    if (!auth.isAuthorized.value) throw UnauthorizedException();
+
+    final client = await auth.configureClient('id');
+    final resp = await client.get('/preferences/notifications');
+    if (resp.statusCode != 200 && resp.statusCode != 404) {
+      context.showErrorDialog(RequestException(resp));
+    }
+
+    if (resp.statusCode == 200) {
+      _config = resp.body['config']
+          .map((k, v) => MapEntry(k, v as bool))
+          .cast<String, bool>();
+    }
+
+    setState(() => _isBusy = false);
+  }
+
+  Future<void> _savePreferences() async {
+    setState(() => _isBusy = true);
+
+    final auth = Get.find<AuthProvider>();
+    if (!auth.isAuthorized.value) throw UnauthorizedException();
+
+    final client = await auth.configureClient('id');
+    final resp = await client.put('/preferences/notifications', {
+      'config': _config,
+    });
+    if (resp.statusCode != 200) {
+      context.showErrorDialog(RequestException(resp));
+    }
+
+    context.showSnackbar('preferencesApplied'.tr);
+
+    setState(() => _isBusy = false);
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _getPreferences();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: Theme.of(context).colorScheme.surface,
+      child: Column(
+        children: [
+          if (_isBusy) const LinearProgressIndicator().animate().scaleX(),
+          ListTile(
+            tileColor: Theme.of(context).colorScheme.surfaceContainer,
+            contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+            leading: const Icon(Icons.save),
+            title: Text('save'.tr),
+            enabled: !_isBusy,
+            onTap: () {
+              _savePreferences();
+            },
+          ),
+          Expanded(
+            child: ListView.builder(
+              itemCount: _topicMap.length,
+              itemBuilder: (context, index) {
+                final element = _topicMap.entries.elementAt(index);
+                return CheckboxListTile(
+                  title: Text(element.value),
+                  subtitle: Text(
+                    element.key,
+                    style: GoogleFonts.robotoMono(fontSize: 12),
+                  ),
+                  value: _config[element.key] ?? true,
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+                  onChanged: (value) {
+                    setState(() {
+                      _config[element.key] = value ?? false;
+                    });
+                  },
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/screens/account/profile_edit.dart
+++ b/lib/screens/account/profile_edit.dart
--- a/lib/screens/account/profile_page.dart
+++ b/lib/screens/account/profile_page.dart
@@ -400,7 +400,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
                            child: AttachmentListEntry(
                              item: item,
                              isDense: true,
-                              parentId: 'album',
+                              parentId: 'album-$index',
                              showMature: _showMature,
                              onReveal: (value) {
                                setState(() => _showMature = value);
--- a/lib/screens/auth/signin.dart
+++ b/lib/screens/auth/signin.dart
@@ -7,6 +7,9 @@ import 'package:solian/exceptions/request.dart';
 import 'package:solian/exts.dart';
 import 'package:solian/models/auth.dart';
 import 'package:solian/providers/auth.dart';
+import 'package:solian/providers/content/channel.dart';
+import 'package:solian/providers/content/realm.dart';
+import 'package:solian/providers/relation.dart';
 import 'package:solian/providers/websocket.dart';
 import 'package:solian/services.dart';
 import 'package:solian/widgets/sized_container.dart';
@@ -164,6 +167,7 @@ class _SignInScreenState extends State<SignInScreen> {

      final result = AuthResult.fromJson(resp.body);
      _currentTicket = result.ticket;
+      _passwordController.clear();

      // Finish sign in if possible
      if (result.isFinished) {
@@ -173,6 +177,9 @@ class _SignInScreenState extends State<SignInScreen> {
          await auth.refreshAuthorizeStatus();
          await auth.refreshUserProfile();

+          Get.find<ChannelProvider>().refreshAvailableChannel();
+          Get.find<RealmProvider>().refreshAvailableRealms();
+          Get.find<RelationshipProvider>().refreshRelativeList();
          Get.find<WebSocketProvider>().registerPushNotifications();
          autoConfigureBackgroundNotificationService();
          autoStartBackgroundNotificationService();
--- a/lib/screens/channel/channel_detail.dart
+++ b/lib/screens/channel/channel_detail.dart
@@ -114,7 +114,7 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
      ListTile(
        leading: const Icon(Icons.settings),
        trailing: const Icon(Icons.chevron_right),
-        title: Text('channelSettings'.tr.capitalize!),
+        title: Text('channelSettings'.tr),
        onTap: () async {
          AppRouter.instance
              .pushNamed(
@@ -173,7 +173,7 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
            children: [
              ListTile(
                leading: const Icon(Icons.notifications_active),
-                title: Text('channelNotifyLevel'.tr.capitalize!),
+                title: Text('channelNotifyLevel'.tr),
                trailing: DropdownButtonHideUnderline(
                  child: DropdownButton2<int>(
                    isExpanded: true,
@@ -208,7 +208,7 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
              ListTile(
                leading: const Icon(Icons.supervisor_account),
                trailing: const Icon(Icons.chevron_right),
-                title: Text('channelMembers'.tr.capitalize!),
+                title: Text('channelMembers'.tr),
                onTap: () => showMemberList(),
              ),
              ...(_isOwned ? ownerActions : List.empty()),
--- a/lib/screens/channel/channel_organize.dart
+++ b/lib/screens/channel/channel_organize.dart
@@ -35,13 +35,14 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
  final _nameController = TextEditingController();
  final _descriptionController = TextEditingController();

-  bool _isEncrypted = false;
+  bool _isPublic = false;
+  bool _isCommunity = false;

-  void applyChannel() async {
+  void _applyChannel() async {
    final AuthProvider auth = Get.find();
    if (auth.isAuthorized.isFalse) return;

-    if (_aliasController.value.text.isEmpty) randomizeAlias();
+    if (_aliasController.value.text.isEmpty) _randomizeAlias();

    setState(() => _isBusy = true);

@@ -52,7 +53,7 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
      'alias': _aliasController.value.text.toLowerCase(),
      'name': _nameController.value.text,
      'description': _descriptionController.value.text,
-      'is_encrypted': _isEncrypted,
+      'is_encrypted': _isPublic,
    };

    Response? resp;
@@ -71,35 +72,44 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
    setState(() => _isBusy = false);
  }

-  void randomizeAlias() {
+  void _randomizeAlias() {
    _aliasController.text =
        const Uuid().v4().replaceAll('-', '').substring(0, 12);
  }

-  void syncWidget() {
+  void _syncWidget() {
    if (widget.edit != null) {
      _aliasController.text = widget.edit!.alias;
      _nameController.text = widget.edit!.name;
      _descriptionController.text = widget.edit!.description;
-      _isEncrypted = widget.edit!.isEncrypted;
+      _isPublic = widget.edit!.isPublic;
+      _isCommunity = widget.edit!.isCommunity;
    }
  }

-  void cancelAction() {
+  void _cancelAction() {
    AppRouter.instance.pop();
  }

  @override
  void initState() {
-    syncWidget();
+    _syncWidget();
    super.initState();
  }

+  @override
+  void dispose() {
+    _aliasController.dispose();
+    _nameController.dispose();
+    _descriptionController.dispose();
+    super.dispose();
+  }
+
  @override
  Widget build(BuildContext context) {
    final notifyBannerActions = [
      TextButton(
-        onPressed: cancelAction,
+        onPressed: _cancelAction,
        child: Text('cancel'.tr),
      ),
    ];
@@ -113,7 +123,7 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
          toolbarHeight: AppTheme.toolbarHeight(context),
          actions: [
            TextButton(
-              onPressed: _isBusy ? null : () => applyChannel(),
+              onPressed: _isBusy ? null : () => _applyChannel(),
              child: Text('apply'.tr.toUpperCase()),
            )
          ],
@@ -164,7 +174,7 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
                      visualDensity:
                          const VisualDensity(horizontal: -2, vertical: -2),
                    ),
-                    onPressed: () => randomizeAlias(),
+                    onPressed: () => _randomizeAlias(),
                    child: const Icon(Icons.refresh),
                  )
                ],
@@ -196,12 +206,17 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
              ),
              const Divider(thickness: 0.3),
              CheckboxListTile(
-                title: Text('channelEncrypted'.tr),
-                value: _isEncrypted,
-                onChanged: (widget.edit?.isEncrypted ?? false)
-                    ? null
-                    : (newValue) =>
-                        setState(() => _isEncrypted = newValue ?? false),
+                title: Text('channelPublic'.tr),
+                value: _isPublic,
+                onChanged: (value) =>
+                    setState(() => _isPublic = value ?? false),
+                controlAffinity: ListTileControlAffinity.leading,
+              ),
+              CheckboxListTile(
+                title: Text('channelCommunity'.tr),
+                value: _isCommunity,
+                onChanged: (value) =>
+                    setState(() => _isCommunity = value ?? false),
                controlAffinity: ListTileControlAffinity.leading,
              ),
            ],
--- a/lib/screens/realms.dart
+++ b/lib/screens/realms.dart
@@ -7,10 +7,13 @@ import 'package:solian/providers/auth.dart';
 import 'package:solian/providers/content/realm.dart';
 import 'package:solian/router.dart';
 import 'package:solian/screens/account/notification.dart';
+import 'package:solian/services.dart';
 import 'package:solian/theme.dart';
+import 'package:solian/widgets/account/account_avatar.dart';
 import 'package:solian/widgets/account/signin_required_overlay.dart';
 import 'package:solian/widgets/app_bar_leading.dart';
 import 'package:solian/widgets/app_bar_title.dart';
+import 'package:solian/widgets/auto_cache_image.dart';
 import 'package:solian/widgets/current_state_action.dart';
 import 'package:solian/widgets/sized_container.dart';

@@ -128,19 +131,34 @@ class _RealmListScreenState extends State<RealmListScreen> {
                  children: [
                    Container(
                      color: Theme.of(context).colorScheme.surfaceContainer,
+                      child: (element.banner?.isEmpty ?? true)
+                          ? const SizedBox.shrink()
+                          : AutoCacheImage(
+                              ServiceFinder.buildUrl(
+                                'uc',
+                                '/attachments/${element.banner}',
+                              ),
+                              fit: BoxFit.cover,
+                            ),
                    ),
-                    const Positioned(
+                    Positioned(
                      bottom: -30,
                      left: 18,
-                      child: CircleAvatar(
-                        radius: 24,
-                        backgroundColor: Colors.indigo,
-                        child: FaIcon(
-                          FontAwesomeIcons.globe,
-                          color: Colors.white,
-                          size: 18,
-                        ),
-                      ),
+                      child: (element.avatar?.isEmpty ?? true)
+                          ? CircleAvatar(
+                              radius: 24,
+                              backgroundColor:
+                                  Theme.of(context).colorScheme.primary,
+                              child: const FaIcon(
+                                FontAwesomeIcons.globe,
+                                color: Colors.white,
+                                size: 18,
+                              ),
+                            )
+                          : AccountAvatar(
+                              content: element.avatar!,
+                              bgColor: Theme.of(context).colorScheme.primary,
+                            ),
                    ),
                  ],
                ),
--- a/lib/screens/realms/realm_detail.dart
+++ b/lib/screens/realms/realm_detail.dart
@@ -69,7 +69,8 @@ class _RealmDetailScreenState extends State<RealmDetailScreen> {
      ListTile(
        leading: const Icon(Icons.settings),
        trailing: const Icon(Icons.chevron_right),
-        title: Text('realmSettings'.tr.capitalize!),
+        title: Text('realmSettings'.tr),
+        contentPadding: const EdgeInsets.symmetric(horizontal: 24),
        onTap: () async {
          AppRouter.instance
              .pushNamed(
@@ -120,14 +121,16 @@ class _RealmDetailScreenState extends State<RealmDetailScreen> {
          child: ListView(
            children: [
              ListTile(
+                contentPadding: const EdgeInsets.symmetric(horizontal: 24),
                leading: const Icon(Icons.supervisor_account),
                trailing: const Icon(Icons.chevron_right),
-                title: Text('realmMembers'.tr.capitalize!),
+                title: Text('realmMembers'.tr),
                onTap: () => showMemberList(),
              ),
              ...(_isOwned ? ownerActions : List.empty()),
              const Divider(thickness: 0.3),
              ListTile(
+                contentPadding: const EdgeInsets.symmetric(horizontal: 24),
                leading: _isOwned
                    ? const Icon(Icons.delete)
                    : const Icon(Icons.exit_to_app),
--- a/lib/screens/realms/realm_organize.dart
+++ b/lib/screens/realms/realm_organize.dart
@@ -1,9 +1,15 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:get/get.dart';
+import 'package:image_cropper/image_cropper.dart';
+import 'package:image_picker/image_picker.dart';
 import 'package:solian/exts.dart';
+import 'package:solian/models/attachment.dart';
 import 'package:solian/models/realm.dart';
 import 'package:solian/providers/auth.dart';
+import 'package:solian/providers/content/attachment.dart';
 import 'package:solian/router.dart';
 import 'package:solian/theme.dart';
 import 'package:solian/widgets/app_bar_leading.dart';
@@ -29,17 +35,19 @@ class _RealmOrganizeScreenState extends State<RealmOrganizeScreen> {
  bool _isBusy = false;

  final _aliasController = TextEditingController();
+  final _avatarController = TextEditingController();
+  final _bannerController = TextEditingController();
  final _nameController = TextEditingController();
  final _descriptionController = TextEditingController();

  bool _isCommunity = false;
  bool _isPublic = false;

-  void applyRealm() async {
+  void _applyRealm() async {
    final AuthProvider auth = Get.find();
    if (auth.isAuthorized.isFalse) return;

-    if (_aliasController.value.text.isEmpty) randomizeAlias();
+    if (_aliasController.value.text.isEmpty) _randomizeAlias();

    setState(() => _isBusy = true);

@@ -49,6 +57,8 @@ class _RealmOrganizeScreenState extends State<RealmOrganizeScreen> {
      'alias': _aliasController.value.text.toLowerCase(),
      'name': _nameController.value.text,
      'description': _descriptionController.value.text,
+      'avatar': _avatarController.value.text,
+      'banner': _bannerController.value.text,
      'is_public': _isPublic,
      'is_community': _isCommunity,
    };
@@ -68,31 +78,110 @@ class _RealmOrganizeScreenState extends State<RealmOrganizeScreen> {
    setState(() => _isBusy = false);
  }

-  void randomizeAlias() {
+  final _imagePicker = ImagePicker();
+
+  Future<void> _editImage(String position) async {
+    final AuthProvider auth = Get.find();
+    if (auth.isAuthorized.isFalse) return;
+
+    final image = await _imagePicker.pickImage(source: ImageSource.gallery);
+    if (image == null) return;
+
+    CroppedFile? croppedFile = await ImageCropper().cropImage(
+      sourcePath: image.path,
+      uiSettings: [
+        AndroidUiSettings(
+          toolbarTitle: 'cropImage'.tr,
+          toolbarColor: Theme.of(context).colorScheme.primary,
+          toolbarWidgetColor: Theme.of(context).colorScheme.onPrimary,
+          aspectRatioPresets: [
+            if (position == 'avatar') CropAspectRatioPreset.square,
+            if (position == 'banner') _BannerCropAspectRatioPreset(),
+          ],
+        ),
+        IOSUiSettings(
+          title: 'cropImage'.tr,
+          aspectRatioPresets: [
+            if (position == 'avatar') CropAspectRatioPreset.square,
+            if (position == 'banner') _BannerCropAspectRatioPreset(),
+          ],
+        ),
+        WebUiSettings(
+          context: context,
+        ),
+      ],
+    );
+
+    if (croppedFile == null) return;
+    final file = File(croppedFile.path);
+
+    setState(() => _isBusy = true);
+
+    final AttachmentProvider attach = Get.find();
+
+    Attachment? attachResult;
+    try {
+      attachResult = await attach.createAttachmentDirectly(
+        await file.readAsBytes(),
+        file.path,
+        'avatar',
+        null,
+      );
+    } catch (e) {
+      setState(() => _isBusy = false);
+      context.showErrorDialog(e);
+      return;
+    }
+
+    switch (position) {
+      case 'avatar':
+        _avatarController.text = attachResult.rid;
+        break;
+      case 'banner':
+        _bannerController.text = attachResult.rid;
+        break;
+    }
+
+    setState(() => _isBusy = false);
+  }
+
+  void _randomizeAlias() {
    _aliasController.text =
        const Uuid().v4().replaceAll('-', '').substring(0, 12);
  }

-  void syncWidget() {
+  void _syncWidget() {
    if (widget.edit != null) {
      _aliasController.text = widget.edit!.alias;
      _nameController.text = widget.edit!.name;
      _descriptionController.text = widget.edit!.description;
+      _avatarController.text = widget.edit!.avatar ?? '';
+      _bannerController.text = widget.edit!.banner ?? '';
      _isPublic = widget.edit!.isPublic;
      _isCommunity = widget.edit!.isCommunity;
    }
  }

-  void cancelAction() {
+  void _cancelAction() {
    AppRouter.instance.pop();
  }

  @override
  void initState() {
-    syncWidget();
+    _syncWidget();
    super.initState();
  }

+  @override
+  void dispose() {
+    _aliasController.dispose();
+    _avatarController.dispose();
+    _bannerController.dispose();
+    _nameController.dispose();
+    _descriptionController.dispose();
+    super.dispose();
+  }
+
  @override
  Widget build(BuildContext context) {
    return Material(
@@ -105,7 +194,7 @@ class _RealmOrganizeScreenState extends State<RealmOrganizeScreen> {
          toolbarHeight: AppTheme.toolbarHeight(context),
          actions: [
            TextButton(
-              onPressed: _isBusy ? null : () => applyRealm(),
+              onPressed: _isBusy ? null : () => _applyRealm(),
              child: Text('apply'.tr.toUpperCase()),
            )
          ],
@@ -126,7 +215,7 @@ class _RealmOrganizeScreenState extends State<RealmOrganizeScreen> {
                  ),
                  actions: [
                    TextButton(
-                      onPressed: cancelAction,
+                      onPressed: _cancelAction,
                      child: Text('cancel'.tr),
                    ),
                  ],
@@ -150,7 +239,7 @@ class _RealmOrganizeScreenState extends State<RealmOrganizeScreen> {
                      visualDensity:
                          const VisualDensity(horizontal: -2, vertical: -2),
                    ),
-                    onPressed: () => randomizeAlias(),
+                    onPressed: () => _randomizeAlias(),
                    child: const Icon(Icons.refresh),
                  )
                ],
@@ -166,6 +255,55 @@ class _RealmOrganizeScreenState extends State<RealmOrganizeScreen> {
                    FocusManager.instance.primaryFocus?.unfocus(),
              ).paddingSymmetric(horizontal: 16, vertical: 8),
              const Divider(thickness: 0.3),
+              Row(
+                children: [
+                  Expanded(
+                    child: TextField(
+                      autofocus: true,
+                      controller: _avatarController,
+                      decoration: InputDecoration.collapsed(
+                        hintText: 'realmAvatar'.tr,
+                      ),
+                      onTapOutside: (_) =>
+                          FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                  ),
+                  TextButton(
+                    style: TextButton.styleFrom(
+                      shape: const CircleBorder(),
+                      visualDensity:
+                          const VisualDensity(horizontal: -2, vertical: -2),
+                    ),
+                    onPressed: _isBusy ? null : () => _editImage('avatar'),
+                    child: const Icon(Icons.upload),
+                  )
+                ],
+              ).paddingSymmetric(horizontal: 16, vertical: 2),
+              Row(
+                children: [
+                  Expanded(
+                    child: TextField(
+                      autofocus: true,
+                      controller: _bannerController,
+                      decoration: InputDecoration.collapsed(
+                        hintText: 'realmBanner'.tr,
+                      ),
+                      onTapOutside: (_) =>
+                          FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                  ),
+                  TextButton(
+                    style: TextButton.styleFrom(
+                      shape: const CircleBorder(),
+                      visualDensity:
+                          const VisualDensity(horizontal: -2, vertical: -2),
+                    ),
+                    onPressed: _isBusy ? null : () => _editImage('banner'),
+                    child: const Icon(Icons.upload),
+                  )
+                ],
+              ).paddingSymmetric(horizontal: 16, vertical: 2),
+              const Divider(thickness: 0.3),
              Expanded(
                child: TextField(
                  minLines: 5,
@@ -202,3 +340,11 @@ class _RealmOrganizeScreenState extends State<RealmOrganizeScreen> {
    );
  }
 }
+
+class _BannerCropAspectRatioPreset extends CropAspectRatioPresetData {
+  @override
+  (int, int)? get data => (16, 7);
+
+  @override
+  String get name => '16x7';
+}
--- a/lib/widgets/navigation/app_navigation_region.dart
+++ b/lib/widgets/navigation/app_navigation_region.dart
@@ -6,7 +6,9 @@ import 'package:solian/providers/auth.dart';
 import 'package:solian/providers/content/channel.dart';
 import 'package:solian/providers/content/realm.dart';
 import 'package:solian/providers/navigation.dart';
+import 'package:solian/services.dart';
 import 'package:solian/widgets/account/account_avatar.dart';
+import 'package:solian/widgets/auto_cache_image.dart';
 import 'package:solian/widgets/channel/channel_list.dart';

 class AppNavigationRegion extends StatefulWidget {
@@ -169,6 +171,19 @@ class _AppNavigationRegionState extends State<AppNavigationRegion> {
                  )
            : Column(
                children: [
+                  if (!widget.isCollapsed &&
+                      (navState.focusedRealm.value!.banner?.isNotEmpty ??
+                          false))
+                    AspectRatio(
+                      aspectRatio: 16 / 7,
+                      child: AutoCacheImage(
+                        ServiceFinder.buildUrl(
+                          'uc',
+                          '/attachments/${navState.focusedRealm.value!.banner}',
+                        ),
+                        fit: BoxFit.cover,
+                      ),
+                    ),
                  if (widget.isCollapsed)
                    Tooltip(
                      message: navState.focusedRealm.value!.name,
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -60,9 +60,9 @@ PODS:
    - FirebaseCoreInternal (~> 11.0)
    - GoogleUtilities/Environment (~> 8.0)
    - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreExtension (11.1.0):
+  - FirebaseCoreExtension (11.2.0):
    - FirebaseCore (~> 11.0)
-  - FirebaseCoreInternal (11.1.0):
+  - FirebaseCoreInternal (11.2.0):
    - "GoogleUtilities/NSData+zlib (~> 8.0)"
  - FirebaseCrashlytics (11.0.0):
    - FirebaseCore (~> 11.0)
@@ -73,7 +73,7 @@ PODS:
    - GoogleUtilities/Environment (~> 8.0)
    - nanopb (~> 3.30910.0)
    - PromisesObjC (~> 2.4)
-  - FirebaseInstallations (11.1.0):
+  - FirebaseInstallations (11.2.0):
    - FirebaseCore (~> 11.0)
    - GoogleUtilities/Environment (~> 8.0)
    - GoogleUtilities/UserDefaults (~> 8.0)
@@ -87,8 +87,8 @@ PODS:
    - GoogleUtilities/Reachability (~> 8.0)
    - GoogleUtilities/UserDefaults (~> 8.0)
    - nanopb (~> 3.30910.0)
-  - FirebaseRemoteConfigInterop (11.1.0)
-  - FirebaseSessions (11.1.0):
+  - FirebaseRemoteConfigInterop (11.2.0)
+  - FirebaseSessions (11.2.0):
    - FirebaseCore (~> 11.0)
    - FirebaseCoreExtension (~> 11.0)
    - FirebaseInstallations (~> 11.0)
@@ -344,13 +344,13 @@ SPEC CHECKSUMS:
  firebase_messaging: ce70e6615f0cd906d80b7a651b960d76dad6de56
  FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a
  FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383
-  FirebaseCoreExtension: aa5c9779c2d0d39d83f1ceb3fdbafe80c4feecfa
-  FirebaseCoreInternal: adefedc9a88dbe393c4884640a73ec9e8e790f8c
+  FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de
+  FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5
  FirebaseCrashlytics: 745d8f0221fe49c62865391d1bf56f5a12eeec0b
-  FirebaseInstallations: d0a8fea5a6fa91abc661591cf57c0f0d70863e57
+  FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a
  FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742
-  FirebaseRemoteConfigInterop: abf8b1bbc0bf1b84abd22b66746926410bf91a87
-  FirebaseSessions: 78f137e68dc01ca71606169ba4ac73b98c13752a
+  FirebaseRemoteConfigInterop: 477b26fdeb8fb5fbaf22fa9db5343b42289dc7db
+  FirebaseSessions: adcec8b72d0066a385e3affcd1bcb1ebb3908ce6
  flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
  flutter_secure_storage_macos: 59459653abe1adb92abbc8ea747d79f8d19866c9
  flutter_webrtc: 2b4e4a2de70a1485836e40fd71a7a94c77d49bd9
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -701,6 +701,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
@@ -843,6 +844,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
@@ -870,6 +872,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: solian
 description: "The Solar Network App"
 publish_to: "none"

-version: 1.2.1+39
+version: 1.2.1+40

 environment:
  sdk: ">=3.3.4 <4.0.0"
Author	SHA1	Message	Date
LittleSheep	e4b741ff0c	🚀 Launch 1.2.1+40	2024-09-17 16:02:13 +08:00
LittleSheep	e69abb7f9d	✨ Notification preferences	2024-09-17 15:59:17 +08:00
LittleSheep	565a8e41cc	✨ Realm avatar, banner	2024-09-17 14:21:37 +08:00
LittleSheep	c9fbe47337	✨ Channel isPublic and isCommunity	2024-09-17 13:50:04 +08:00
LittleSheep	01db63e297	🐛 Fix compability on iOS 18 and macOS 15	2024-09-17 13:39:08 +08:00