diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index 4f15d78e2..e124d0ffb 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -211,33 +211,23 @@ class ChatDetailsView extends StatelessWidget { ], ), Divider(color: theme.dividerColor), - if (!room.canChangeStateEvent(EventTypes.RoomTopic)) - ListTile( - title: Text( - L10n.of(context).chatDescription, - style: TextStyle( - color: theme.colorScheme.secondary, - fontWeight: FontWeight.bold, - ), - ), - ) - else - Padding( - padding: const EdgeInsets.all(16.0), - child: TextButton.icon( - onPressed: controller.setTopicAction, - label: Text(L10n.of(context).setChatDescription), - icon: const Icon(Icons.edit_outlined), - style: TextButton.styleFrom( - iconColor: - theme.colorScheme.onSecondaryContainer, - backgroundColor: - theme.colorScheme.secondaryContainer, - foregroundColor: - theme.colorScheme.onSecondaryContainer, - ), + ListTile( + title: Text( + L10n.of(context).chatDescription, + style: TextStyle( + color: theme.colorScheme.secondary, + fontWeight: FontWeight.bold, ), ), + trailing: room + .canChangeStateEvent(EventTypes.RoomTopic) + ? IconButton( + onPressed: controller.setTopicAction, + tooltip: L10n.of(context).setChatDescription, + icon: const Icon(Icons.edit_outlined), + ) + : null, + ), Padding( padding: const EdgeInsets.symmetric( horizontal: 16.0, diff --git a/macos/Podfile.lock b/macos/Podfile.lock index d79606925..80bbc5087 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -25,9 +25,9 @@ PODS: - FlutterMacOS - flutter_web_auth_2 (3.0.0): - FlutterMacOS - - flutter_webrtc (1.1.0): + - flutter_webrtc (1.2.0): - FlutterMacOS - - WebRTC-SDK (= 137.7151.03) + - WebRTC-SDK (= 137.7151.04) - FlutterMacOS (1.0.0) - geolocator_apple (1.2.0): - Flutter @@ -64,7 +64,7 @@ PODS: - FlutterMacOS - wakelock_plus (0.0.1): - FlutterMacOS - - WebRTC-SDK (137.7151.03) + - WebRTC-SDK (137.7151.04) - window_to_front (0.0.1): - FlutterMacOS @@ -175,7 +175,7 @@ SPEC CHECKSUMS: flutter_secure_storage_macos: 7f45e30f838cf2659862a4e4e3ee1c347c2b3b54 flutter_vodozemac: fd2ea9cb3e2a37beaac883a369811fbfe042fc53 flutter_web_auth_2: 62b08da29f15a20fa63f144234622a1488d45b65 - flutter_webrtc: 1ce7fe9a42f085286378355a575e682edd7f114d + flutter_webrtc: 718eae22a371cd94e5d56aa4f301443ebc5bb737 FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1 geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed @@ -189,8 +189,8 @@ SPEC CHECKSUMS: url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673 video_compress: 752b161da855df2492dd1a8fa899743cc8fe9534 video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b - wakelock_plus: 21ddc249ac4b8d018838dbdabd65c5976c308497 - WebRTC-SDK: 69d4e56b0b4b27d788e87bab9b9a1326ed05b1e3 + wakelock_plus: 917609be14d812ddd9e9528876538b2263aaa03b + WebRTC-SDK: 40d4f5ba05cadff14e4db5614aec402a633f007e window_to_front: 9e76fd432e36700a197dac86a0011e49c89abe0a PODFILE CHECKSUM: d0975b16fbdecb73b109d8fbc88aa77ffe4c7a8d diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 41d360c6f..5b297f8ab 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -216,7 +216,6 @@ 33CC10EC2044A3C60003C045 = { CreatedOnToolsVersion = 9.2; LastSwiftMigration = 1100; - ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.Sandbox = { enabled = 1; @@ -427,7 +426,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 4NXF6Z997G; @@ -559,7 +558,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 4NXF6Z997G; @@ -585,7 +584,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 4NXF6Z997G;