Merge pull request #770 from 100mslive/dev

PratimMallick · web-flow · commit ca00e87c14b8 · 2024-10-16T20:42:08.000+05:30
1.2.20 release
diff --git 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
@@ -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.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
diff --git 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
@@ -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
@@ -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
@@ -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/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
                     )
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`	`android {`
`10`	`10`	`compileSdk 34`
	`11`	`+ namespace = "live.hms.app2"`
`11`	`12`
`12`	`13`	`defaultConfig {`
`13`	`14`	`applicationId "live.hms.app2"`
`@@ -41,13 +42,14 @@ android {`
`41`	`42`
`42`	`43`	`buildFeatures {`
`43`	`44`	`viewBinding = true`
	`45`	`+ buildConfig = true`
`44`	`46`	`}`
`45`	`47`	`compileOptions {`
`46`		`- sourceCompatibility = "1.8"`
`47`		`- targetCompatibility = "1.8"`
	`48`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`49`	`+ targetCompatibility JavaVersion.VERSION_17`
`48`	`50`	`}`
`49`	`51`	`kotlinOptions {`
`50`		`- jvmTarget = '1.8'`
	`52`	`+ jvmTarget = '17'`
`51`	`53`	`}`
`52`	`54`	`}`
`53`	`55`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:7.4.2'`
	`12`	`+ classpath 'com.android.tools.build:gradle:8.2.0'`
`13`	`13`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`14`	`14`
`15`	`15`	`// Jetpack Navigation`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ android {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`compileOptions {`
`30`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`31`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`30`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`31`	`+ targetCompatibility = JavaVersion.VERSION_17`
`32`	`32`	`}`
`33`	`33`	`kotlinOptions {`
`34`		`- jvmTarget = "1.8"`
	`34`	`+ jvmTarget = "17"`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -39,19 +39,18 @@ android {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`compileOptions {`
`42`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`43`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`42`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`43`	`+ targetCompatibility JavaVersion.VERSION_17`
`44`	`44`	`}`
`45`	`45`	`kotlinOptions {`
`46`		`- jvmTarget = '1.8'`
	`46`	`+ jvmTarget = '17'`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`buildFeatures {`
`50`	`50`	`viewBinding true`
`51`		`- dataBinding {`
`52`		`- enabled true`
`53`		`- }`
	`51`	`+ dataBinding true`
`54`	`52`	`compose true`
	`53`	`+ buildConfig = true`
`55`	`54`	`}`
`56`	`55`	`composeOptions {`
`57`	`56`	`kotlinCompilerExtensionVersion = "1.4.8"`
Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ class PreviewFragment : Fragment() {`
`652`	`652`	`if (setTextOnce.not()) {`
`653`	`653`	`setupUI(room.localPeer?.hmsRole?.name.orEmpty())`
`654`	`654`	`binding.nameInitials.visibility = View.VISIBLE`
`655`		`- binding.nameInitials.text = NameUtils.getInitials(room.localPeer!!.name)`
	`655`	`+ room.localPeer?.name?.let { binding.nameInitials.text = it }`
`656`	`656`	`binding.editTextName.setText(`
`657`	`657`	`room.localPeer?.name.orEmpty(), TextView.BufferType.EDITABLE`
`658`	`658`	`)`
Original file line number	Diff line number	Diff line change
`@@ -152,11 +152,11 @@ data class TranscriptViewHolder(`
`152`	`152`	`}`
`153`	`153`	`fun getSubtitle() : AnnotatedString {`
`154`	`154`	`return buildAnnotatedString {`
`155`		`- withStyle(style = SpanStyle(fontFamily = FontFamily(Font(R.font.inter_bold)))) {`
	`155`	`+ withStyle(style = SpanStyle(fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_bold)))) {`
`156`	`156`	`append(peerName)`
`157`	`157`	`append(": ")`
`158`	`158`	`}`
`159`		`- withStyle(style = SpanStyle(fontFamily = FontFamily(Font(R.font.inter_regular)))) {`
	`159`	`+ withStyle(style = SpanStyle(fontFamily = FontFamily(Font(live.hms.prebuilt_themes.R.font.inter_regular)))) {`
`160`	`160`	`append(text)`
`161`	`161`	`}`
`162`	`162`	`}`