🚀 Launch 1.2.2+2

lib/providers/content/channel.dart

@@ -89,13 +89,13 @@ class ChannelProvider extends GetxController {
     return resp;
   }
 
-  Future<Response> listAvailableChannel({String realm = 'global'}) async {
+  Future<Response> listAvailableChannel({String scope = 'global'}) async {
     final AuthProvider auth = Get.find();
     if (auth.isAuthorized.isFalse) throw const UnauthorizedException();
 
     final client = await auth.configureClient('messaging');
 
-    final resp = await client.get('/channels/$realm/me/available');
+    final resp = await client.get('/channels/$scope/me/available');
     if (resp.statusCode != 200) {
       throw RequestException(resp);
     }

lib/screens/channel/channel_detail.dart

@@ -115,6 +115,7 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
         leading: const Icon(Icons.settings),
         trailing: const Icon(Icons.chevron_right),
         title: Text('channelSettings'.tr),
+        contentPadding: const EdgeInsets.symmetric(horizontal: 24),
         onTap: () async {
           AppRouter.instance
               .pushNamed(
@@ -174,6 +175,7 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
               ListTile(
                 leading: const Icon(Icons.notifications_active),
                 title: Text('channelNotifyLevel'.tr),
+                contentPadding: const EdgeInsets.symmetric(horizontal: 24),
                 trailing: DropdownButtonHideUnderline(
                   child: DropdownButton2<int>(
                     isExpanded: true,
@@ -206,6 +208,7 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
                 ),
               ),
               ListTile(
+                contentPadding: const EdgeInsets.symmetric(horizontal: 24),
                 leading: const Icon(Icons.supervisor_account),
                 trailing: const Icon(Icons.chevron_right),
                 title: Text('channelMembers'.tr),
@@ -214,6 +217,7 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
               ...(_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),

lib/screens/realms/realm_view.dart

@@ -34,7 +34,7 @@ class _RealmViewScreenState extends State<RealmViewScreen> {
   final List<Channel> _channels = List.empty(growable: true);
 
   getRealm({String? overrideAlias}) async {
-    final RealmProvider provider = Get.find();
+    final RealmProvider realm = Get.find();
 
     setState(() => _isBusy = true);
 
@@ -43,7 +43,7 @@ class _RealmViewScreenState extends State<RealmViewScreen> {
     }
 
     try {
-      final resp = await provider.getRealm(_overrideAlias ?? widget.alias);
+      final resp = await realm.getRealm(_overrideAlias ?? widget.alias);
       setState(() => _realm = Realm.fromJson(resp.body));
     } catch (e) {
       context.showErrorDialog(e);
@@ -55,14 +55,26 @@ class _RealmViewScreenState extends State<RealmViewScreen> {
   getChannels() async {
     setState(() => _isBusy = true);
 
-    final ChannelProvider provider = Get.find();
-    final resp = await provider.listChannel(scope: _realm!.alias);
+    final ChannelProvider channel = Get.find();
+    final resp = await channel.listChannel(scope: _realm!.alias);
+    final availableResp = await channel.listAvailableChannel(
+      scope: _realm!.alias,
+    );
+
+    final Set<int> channelIdx = {};
 
     setState(() {
       _channels.clear();
       _channels.addAll(
         resp.body.map((e) => Channel.fromJson(e)).toList().cast<Channel>(),
       );
+      _channels.addAll(
+        availableResp.body
+            .map((e) => Channel.fromJson(e))
+            .toList()
+            .cast<Channel>(),
+      );
+      _channels.retainWhere((x) => channelIdx.add(x.id));
     });
 
     setState(() => _isBusy = false);

pubspec.yaml

@@ -2,7 +2,7 @@ name: solian
 description: "The Solar Network App"
 publish_to: "none"
 
-version: 1.2.2+1
+version: 1.2.2+2
 
 environment:
   sdk: ">=3.3.4 <4.0.0"