Skip to content

Commit

Permalink
Merge branch 'develop' into ISS-22846
Browse files Browse the repository at this point in the history
  • Loading branch information
@Decoder07
Decoder07 authored Jul 30, 2024
2 parents ca460e6 + df5690c commit 151f61a
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 31 deletions.
1 change: 1 addition & 0 deletions packages/hms_room_kit/lib/src/widgets/bottom_sheets/change_role_bottom_sheet.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class ChangeRoleBottomSheetState extends State<ChangeRoleBottomSheet> {
child: HMSDropDown(
dropDownItems: <DropdownMenuItem>[
...widget.roles
.where((role) => ((role.name != widget.peer.role.name) && (role.name != '__internal_recorder')))
.sortedBy((element) => element.priority.toString())
.map((role) => DropdownMenuItem(
value: role,
Expand Down
2 changes: 1 addition & 1 deletion packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
),
]),
),
if (changeRolePermission)
if (changeRolePermission && meetingStore.roles.length > 1)
PopupMenuItem(
value: 5,
child: Row(children: [
Expand Down
4 changes: 2 additions & 2 deletions packages/hms_room_kit/lib/src/widgets/bottom_sheets/remote_peer_bottom_sheet.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ class _RemotePeerBottomSheetState extends State<RemotePeerBottomSheet> {
textColor: widget.peerTrackNode.track == null
? HMSThemeColors.onSurfaceLowEmphasis
: HMSThemeColors.onSurfaceHighEmphasis)),
if (widget.meetingStore.localPeer?.role.permissions
if ((widget.meetingStore.localPeer?.role.permissions
.changeRole ??
false)
false) && (widget.meetingStore.roles.length > 1))
ListTile(
horizontalTitleGap: 2,
onTap: () async {
Expand Down
38 changes: 20 additions & 18 deletions packages/hmssdk_flutter/example/android/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.929.0)
aws-sdk-core (3.196.1)
aws-partitions (1.959.0)
aws-sdk-core (3.201.3)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.81.0)
aws-sdk-core (~> 3, >= 3.193.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.151.0)
aws-sdk-core (~> 3, >= 3.194.0)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.156.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.9.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
Expand All @@ -44,7 +44,7 @@ GEM
domain_name (0.6.20240107)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.110.0)
excon (0.111.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand All @@ -66,7 +66,7 @@ GEM
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
Expand Down Expand Up @@ -160,16 +160,16 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.5)
http-cookie (1.0.6)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jmespath (1.6.2)
json (2.7.2)
jwt (2.8.1)
jwt (2.8.2)
base64
mini_magick (4.12.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
minitest (5.22.3)
multi_json (1.15.0)
Expand All @@ -180,14 +180,15 @@ GEM
optparse (0.5.0)
os (1.1.4)
plist (3.7.1)
public_suffix (5.0.5)
public_suffix (6.0.1)
rake (13.2.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.6)
rexml (3.2.9)
strscan
rouge (2.0.7)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand All @@ -200,6 +201,7 @@ GEM
simctl (1.6.10)
CFPropertyList
naturally
strscan (3.1.0)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand Down
4 changes: 2 additions & 2 deletions packages/hmssdk_flutter/example/android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ android {
applicationId "live.hms.flutter"
minSdkVersion 21
targetSdkVersion 34
versionCode 519
versionName "1.5.219"
versionCode 520
versionName "1.5.220"
}

signingConfigs {
Expand Down
12 changes: 6 additions & 6 deletions packages/hmssdk_flutter/example/ios/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.955.0)
aws-sdk-core (3.201.1)
aws-partitions (1.959.0)
aws-sdk-core (3.201.3)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
Expand All @@ -28,7 +28,7 @@ GEM
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.8.0)
aws-sigv4 (1.9.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
Expand Down Expand Up @@ -66,15 +66,15 @@ GEM
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.3.1)
fastlane (2.221.1)
fastlane (2.222.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -181,7 +181,7 @@ GEM
optparse (0.5.0)
os (1.1.4)
plist (3.7.1)
public_suffix (6.0.0)
public_suffix (6.0.1)
rake (13.2.1)
representable (3.2.0)
declarative (< 0.1.0)
Expand Down
4 changes: 2 additions & 2 deletions packages/hmssdk_flutter/example/ios/Runner/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.5.219</string>
<string>1.5.220</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -48,7 +48,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>519</string>
<string>520</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
Expand Down

0 comments on commit 151f61a

Please sign in to comment.