From cad3660ecf44c1a2d72ccdf417de1b6b55594ef4 Mon Sep 17 00:00:00 2001 From: Jackson E J Date: Tue, 8 Oct 2024 13:33:36 +0530 Subject: [PATCH 1/3] gradle 8.2 upgrade --- app/build.gradle | 8 +++--- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- prebuilt-themes/build.gradle.kts | 6 ++--- room-kit/build.gradle | 11 ++++---- .../ui/meeting/ClosedCaptionsForEveryone.kt | 6 ++--- .../ui/meeting/SwitchRoleBottomSheet.kt | 10 ++++---- .../ui/meeting/TranscriptionUseCase.kt | 4 +-- .../ui/meeting/activespeaker/HlsFragment.kt | 25 ++++++++++--------- vb-prebuilt/build.gradle.kts | 6 ++--- .../vb_prebuilt/VirtualBackgroundOptions.kt | 10 ++++---- 11 files changed, 46 insertions(+), 44 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e38d1e205..d01bd70e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,6 +8,7 @@ plugins { } android { compileSdk 34 + namespace = "live.hms.app2" defaultConfig { applicationId "live.hms.app2" @@ -41,13 +42,14 @@ android { buildFeatures { viewBinding = true + buildConfig = true } compileOptions { - sourceCompatibility = "1.8" - targetCompatibility = "1.8" + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } } diff --git a/build.gradle b/build.gradle index 2a00ac93a..012af3518 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // Jetpack Navigation diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8c53f789a..b9befd0a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Feb 10 17:14:29 IST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/prebuilt-themes/build.gradle.kts b/prebuilt-themes/build.gradle.kts index 90b41cb56..f70105ef8 100644 --- a/prebuilt-themes/build.gradle.kts +++ b/prebuilt-themes/build.gradle.kts @@ -27,11 +27,11 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } } diff --git a/room-kit/build.gradle b/room-kit/build.gradle index 76ebfe495..e7ee383b9 100644 --- a/room-kit/build.gradle +++ b/room-kit/build.gradle @@ -39,19 +39,18 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } buildFeatures { viewBinding true - dataBinding { - enabled true - } + dataBinding true compose true + buildConfig = true } composeOptions { kotlinCompilerExtensionVersion = "1.4.8" diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/ClosedCaptionsForEveryone.kt b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/ClosedCaptionsForEveryone.kt index 8b259078f..6769fee63 100644 --- a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/ClosedCaptionsForEveryone.kt +++ b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/ClosedCaptionsForEveryone.kt @@ -152,7 +152,7 @@ fun EnableCaptionsDisplay(onEnableForEveryoneClicked : () -> Unit, text = screen.title, style = TextStyle( fontSize = 20.sp, lineHeight = 24.sp, - fontFamily = FontFamily(Font(R.font.inter_bold)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_bold)), fontWeight = FontWeight(600), color = Variables.OnSecondaryHigh, letterSpacing = 0.15.sp, @@ -206,7 +206,7 @@ fun EnableButton( style = TextStyle( fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = FontFamily(Font(R.font.inter_bold)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_bold)), fontWeight = FontWeight(600), color = Variables.OnPrimaryHigh, textAlign = TextAlign.Center, @@ -225,7 +225,7 @@ fun DescriptionText(text : String) { style = TextStyle( fontSize = 14.sp, lineHeight = 20.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(400), color = Variables.OnSurfaceMedium, letterSpacing = 0.25.sp, diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/SwitchRoleBottomSheet.kt b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/SwitchRoleBottomSheet.kt index 999b689ac..ed5ef3f72 100644 --- a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/SwitchRoleBottomSheet.kt +++ b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/SwitchRoleBottomSheet.kt @@ -175,7 +175,7 @@ fun SwitchComponent( ) { fun getDescriptionText(): AnnotatedString { val nameStyle = SpanStyle( - fontFamily = FontFamily(Font(R.font.inter_bold)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_bold)), ) return buildAnnotatedString { @@ -222,7 +222,7 @@ fun SwitchComponent( modifier = Modifier.weight(1f), text = "Switch Role", style = TextStyle( fontSize = 20.sp, lineHeight = 24.sp, - fontFamily = FontFamily(Font(R.font.inter_bold)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_bold)), fontWeight = FontWeight(600), color = Variables.OnSecondaryHigh, letterSpacing = 0.15.sp, @@ -242,7 +242,7 @@ fun SwitchComponent( modifier = Modifier.fillMaxWidth(), text = getDescriptionText(), style = TextStyle( fontSize = 14.sp, lineHeight = 20.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(400), color = Variables.OnSurfaceMedium, letterSpacing = 0.25.sp, @@ -311,7 +311,7 @@ fun SpinnerText(it: String, modifier: Modifier) { text = it, modifier, style = TextStyle( fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(400), color = Variables.OnSurfaceHigh ) @@ -388,7 +388,7 @@ fun ChangeRoleButton( style = TextStyle( fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = FontFamily(Font(R.font.inter_bold)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_bold)), fontWeight = FontWeight(600), color = Variables.OnPrimaryHigh, textAlign = TextAlign.Center, diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/TranscriptionUseCase.kt b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/TranscriptionUseCase.kt index cc9184a81..cb045e1c5 100644 --- a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/TranscriptionUseCase.kt +++ b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/TranscriptionUseCase.kt @@ -152,11 +152,11 @@ data class TranscriptViewHolder( } fun getSubtitle() : AnnotatedString { return buildAnnotatedString { - withStyle(style = SpanStyle(fontFamily = FontFamily(Font(R.font.inter_bold)))) { + withStyle(style = SpanStyle(fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_bold)))) { append(peerName) append(": ") } - withStyle(style = SpanStyle(fontFamily = FontFamily(Font(R.font.inter_regular)))) { + withStyle(style = SpanStyle(fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)))) { append(text) } } diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/activespeaker/HlsFragment.kt b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/activespeaker/HlsFragment.kt index e40334633..e931eafcf 100644 --- a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/activespeaker/HlsFragment.kt +++ b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/activespeaker/HlsFragment.kt @@ -583,7 +583,7 @@ fun ChatHeader( "About Session", fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = FontFamily(Font(R.font.inter_semibold)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_semibold)), fontWeight = FontWeight(600), color = OnSurfaceHigh, letterSpacing = 0.15.sp, @@ -613,7 +613,7 @@ fun ChatHeader( GlideImage( model = logoUrl, - loading = if (LocalInspectionMode.current) placeholder(R.drawable.exo_edit_mode_logo) else null, + loading = if (LocalInspectionMode.current) placeholder(androidx.media3.ui.R.drawable.exo_edit_mode_logo) else null, contentDescription = "Logo" ) Column { @@ -622,7 +622,7 @@ fun ChatHeader( it, style = TextStyle( fontSize = 14.sp, lineHeight = 20.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(600), color = Variables.OnSecondaryHigh, letterSpacing = 0.1.sp, @@ -633,13 +633,13 @@ fun ChatHeader( Row(horizontalArrangement = Arrangement.spacedBy(12.dp, Alignment.Start)) { val textStyle = SpanStyle( fontSize = 12.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(400), color = Variables.OnSurfaceMedium, letterSpacing = 0.4.sp, ) val moreStyle = SpanStyle( - fontFamily = FontFamily(Font(R.font.inter_semibold)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_semibold)), fontSize = 12.sp, fontWeight = FontWeight(600), color = OnSurfaceHigh, @@ -677,7 +677,7 @@ fun ChatHeader( text = description, fontSize = 14.sp, lineHeight = 20.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(400), color = Variables.OnSurfaceMedium, ) @@ -757,7 +757,7 @@ fun ChatMessage(name: String, message: String) { name, style = TextStyle( fontSize = 14.sp, lineHeight = 20.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(600), color = OnSurfaceHigh, letterSpacing = 0.1.sp, @@ -767,7 +767,7 @@ fun ChatMessage(name: String, message: String) { message, style = TextStyle( fontSize = 14.sp, lineHeight = 20.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(400), color = OnSurfaceHigh, letterSpacing = 0.25.sp, @@ -834,7 +834,7 @@ fun GoLiveText(isLive : Boolean, behindBy: String, goLiveClicked : () -> Unit) { style = TextStyle( fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(600), color = if(isLive) OnSurfaceHigh else Variables.OnSurfaceMedium, letterSpacing = 0.5.sp, @@ -849,7 +849,7 @@ fun GoLiveText(isLive : Boolean, behindBy: String, goLiveClicked : () -> Unit) { style = TextStyle( fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(600), color = if(isLive) OnSurfaceHigh else Variables.OnSurfaceMedium, letterSpacing = 0.5.sp, @@ -893,6 +893,7 @@ fun SettingsButton( // } //} +@SuppressLint("UnusedBoxWithConstraintsScope") @OptIn(ExperimentalComposeUiApi::class) @UnstableApi @Composable @@ -1013,7 +1014,7 @@ fun HlsComposable( style = TextStyle( fontSize = 11.sp, lineHeight = 13.sp, - fontFamily = FontFamily(Font(R.font.inter_semibold)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_semibold)), color = Color.White, letterSpacing = 0.5.sp, ) @@ -1426,7 +1427,7 @@ fun HlsChatIcon(chatEnabled: Boolean, unreadMessages :Int?, buttonClicked: () -> lineHeight = 16.sp, color = OnSurfaceHigh, fontSize = 10.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(600), textAlign = TextAlign.Center, ) diff --git a/vb-prebuilt/build.gradle.kts b/vb-prebuilt/build.gradle.kts index c294e63e6..0d3726f7c 100644 --- a/vb-prebuilt/build.gradle.kts +++ b/vb-prebuilt/build.gradle.kts @@ -27,11 +27,11 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } buildFeatures { diff --git a/vb-prebuilt/src/main/java/live/hms/vb_prebuilt/VirtualBackgroundOptions.kt b/vb-prebuilt/src/main/java/live/hms/vb_prebuilt/VirtualBackgroundOptions.kt index 270f2cc63..97b9d1801 100644 --- a/vb-prebuilt/src/main/java/live/hms/vb_prebuilt/VirtualBackgroundOptions.kt +++ b/vb-prebuilt/src/main/java/live/hms/vb_prebuilt/VirtualBackgroundOptions.kt @@ -124,7 +124,7 @@ fun VirtualBackgroundOptions( text = "Effects", style = TextStyle( fontSize = 14.sp, lineHeight = 24.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(600), color = Variables.OnSecondaryHigh, letterSpacing = 0.15.sp, @@ -187,7 +187,7 @@ fun VirtualBackgroundOptions( style = TextStyle( fontSize = 14.sp, lineHeight = 20.sp, - fontFamily = FontFamily(Font(R.font.inter_bold)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_bold)), fontWeight = FontWeight(600), color = Variables.OnSurfaceHigh, letterSpacing = 0.1.sp, @@ -276,7 +276,7 @@ fun BottomSheetHeader(close : () -> Unit,) { text = "Virtual Background", style = TextStyle( fontSize = 16.sp, lineHeight = 24.sp, - fontFamily = FontFamily(Font(R.font.inter_bold)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_bold)), fontWeight = FontWeight(600), color = Variables.OnSecondaryHigh, letterSpacing = 0.15.sp, @@ -287,7 +287,7 @@ fun BottomSheetHeader(close : () -> Unit,) { .padding(1.dp) .size(24.dp) .clickable { close() }, - painter = painterResource(id = R.drawable.outline_cross), + painter = painterResource(id = live.hms.prebuilt_themes.R.drawable.outline_cross), contentDescription = "Close", contentScale = ContentScale.None ) @@ -325,7 +325,7 @@ fun VbOptionButton(@DrawableRes drawable : Int, style = TextStyle( fontSize = 12.sp, lineHeight = 16.sp, - fontFamily = FontFamily(Font(R.font.inter_regular)), + fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)), fontWeight = FontWeight(400), color = Variables.OnSurfaceMedium, letterSpacing = 0.4.sp, From 3f63501a3d41328df6d897a2db55dab0e3cbee30 Mon Sep 17 00:00:00 2001 From: Gulzar Date: Wed, 16 Oct 2024 18:23:03 +0400 Subject: [PATCH 2/3] fix --- .../main/java/live/hms/roomkit/ui/meeting/PreviewFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/PreviewFragment.kt b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/PreviewFragment.kt index 2c9b2f2ca..193523e71 100644 --- a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/PreviewFragment.kt +++ b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/PreviewFragment.kt @@ -652,7 +652,7 @@ class PreviewFragment : Fragment() { if (setTextOnce.not()) { setupUI(room.localPeer?.hmsRole?.name.orEmpty()) binding.nameInitials.visibility = View.VISIBLE - binding.nameInitials.text = NameUtils.getInitials(room.localPeer!!.name) + room.localPeer?.name?.let { binding.nameInitials.text = it } binding.editTextName.setText( room.localPeer?.name.orEmpty(), TextView.BufferType.EDITABLE ) From 81156d89527b3aa1a1a842e237df7db66e108848 Mon Sep 17 00:00:00 2001 From: Gulzar Date: Wed, 16 Oct 2024 18:23:09 +0400 Subject: [PATCH 3/3] 1.2.20 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4c5657774..7064a9dc6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ kotlin.code.style=official 100MS_APP_VERSION_CODE=378 100MS_APP_VERSION_NAME=5.0.13 hmsRoomKitGroup=live.100ms -HMS_ROOM_KIT_VERSION=1.2.19 +HMS_ROOM_KIT_VERSION=1.2.20 android.suppressUnsupportedCompileSdk=33 HMS_SDK_VERSION=2.9.68 # Common publishing info