Merge pull request #756 from 100mslive/dev

dev

app/build.gradle

@@ -61,9 +61,9 @@ dependencies {
  //100ms.live prebuilt lib
  implementation "live.100ms:room-kit:$HMS_ROOM_KIT_VERSION"
 
+ implementation "live.100ms:virtual-background:$HMS_SDK_VERSION"
  //100ms noise cancellation dep
- def hmsVersion = "2.9.62"
- implementation "live.100ms:hms-noise-cancellation-android:$hmsVersion"
+ implementation "live.100ms:hms-noise-cancellation-android:$HMS_SDK_VERSION"
 
  // Navigation
  implementation "androidx.navigation:navigation-fragment-ktx:2.4.0"

app/src/main/AndroidManifest.xml

@@ -23,16 +23,16 @@
  android:label="@string/app_name"
  android:roundIcon="@mipmap/ic_launcher_round"
  android:supportsRtl="false"
- android:theme="@style/Theme.App2">
+ android:theme="@style/Theme.HmsHomeApp">
  <activity
  android:name=".ui.home.QrCodeActivity"
  android:exported="false" />
  <activity
  android:name=".ui.home.HomeActivity"
  android:exported="true"
  android:label="@string/app_name"
+ android:theme="@style/Theme.HmsHomeApp.NoActionBar"
  android:screenOrientation="portrait"
- android:theme="@style/Theme.App2.NoActionBar"
  android:windowSoftInputMode="stateAlwaysHidden|adjustResize">
  <intent-filter android:exported="true">
  <action android:name="android.intent.action.MAIN" />

app/src/main/res/values/strings.xml

@@ -41,7 +41,6 @@
  <string name="share_link">Share Link</string>
  <string name="more_options">More Options</string>
  <string name="meeting_options">Meeting Options</string>
- <string name="meeting">Meeting</string>
  <string name="open_chat">Open Chat</string>
  <string name="share_screen">Share Screen</string>
  <string name="stop_share_screen">Stop Share Screen</string>

app/src/main/res/values/themes.xml

@@ -1,113 +1,3 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
- <!-- Base application theme. -->
- <style name="Theme.App2" parent="Theme.MaterialComponents">
- <!-- Primary brand color. -->
- <item name="colorPrimary">@color/blue_1</item>
- <item name="colorPrimaryVariant">@color/primary_bg</item>
- <item name="colorOnPrimary">@color/white</item>
-
- <!-- Secondary brand color. -->
- <item name="colorAccent">@color/primary_blue</item>
- <item name="colorSecondary">@color/primary_blue</item>
- <item name="colorSecondaryVariant">@color/blue_3</item>
- <item name="colorOnSecondary">@color/white</item>
-
- <!-- Status bar color. -->
- <item name="android:statusBarColor" >@color/primary_bg</item>
-
- <!-- Cards, Background etc -->
- <item name="colorSurface">@color/blue_3</item>
-
- <!-- Overflow Menu -->
- <item name="android:itemBackground">@color/blue_3</item>
-
- <!-- Default Background Color -->
- <item name="android:colorBackground">@color/blue_0</item>
-
- <item name="colorOnSurface">@android:color/white</item>
- <item name="colorOnBackground">@android:color/white</item>
- <item name="colorOnPrimarySurface">@android:color/white</item>
-
- <item name="fontFamily">@font/clan_pro_news</item>
- </style>
-
- <style name="Theme.App2.NoActionBar">
- <item name="windowActionBar">false</item>
- <item name="windowNoTitle">true</item>
- </style>
-
- <style name="TextInputLayout" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
- <item name="android:layout_marginTop">6dp</item>
- <item name="android:layout_marginBottom">6dp</item>
- <item name="boxStrokeWidth">0dp</item>
- <item name="hintEnabled">false</item>
- <item name="boxStrokeWidthFocused">0dp</item>
- <item name="boxBackgroundColor">@color/blue_4</item>
- <item name="android:textColorHint">@color/white_faded_30</item>
- <item name="hintTextColor">@color/white</item>
- <item name="endIconMode">clear_text</item>
- </style>
-
- <style name="AutoCompleteTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
- <item name="android:layout_marginTop">6dp</item>
- <item name="android:layout_marginBottom">6dp</item>
- <item name="hintEnabled">true</item>
- <item name="boxStrokeWidth">0dp</item>
- <item name="boxStrokeWidthFocused">0dp</item>
- <item name="boxBackgroundColor">@color/blue_4</item>
- <item name="android:textColorHint">@color/white_faded_30</item>
- <item name="hintTextColor">@color/white</item>
- </style>
-
- <style name="MaterialButton" parent="Widget.MaterialComponents.Button">
- <item name="android:textColor">@color/white</item>
- <item name="fontFamily">@font/clan_pro_medium</item>
- </style>
-
- <style name="MaterialTextButton" parent="Widget.MaterialComponents.Button.TextButton">
- <item name="android:textColor">@color/text_color</item>
- <item name="fontFamily">@font/clan_pro_medium</item>
- </style>
-
- <style name="MaterialTextViewHeading" parent="Widget.MaterialComponents.TextView">
- <item name="android:textColor">@color/white</item>
- <item name="fontFamily">@font/clan_pro_medium</item>
- </style>
-
- <style name="MaterialSwitch" parent="Widget.AppCompat.CompoundButton.Switch">
- <item name="thumbTint">@color/white</item>
- </style>
-
- <style name="MaterialImageButton" parent="Widget.MaterialComponents.Button.TextButton">
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_weight">1</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_gravity">center</item>
- <item name="android:gravity">center</item>
- <item name="android:padding">8dp</item>
- <item name="android:clickable">true</item>
- <item name="android:layout_margin">0dp</item>
- <item name="android:inset">0dp</item>
- <item name="iconGravity">textStart</item>
- <item name="iconTint">@color/white</item>
- </style>
-
- <style name="RoleChangeAlertDialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
- <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
- <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
- </style>
-
- <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
- <item name="android:textColor">#ffff</item>
- </style>
-
- <style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
- <item name="android:textColor">#ffff</item>
- </style>
-
- <style name="SpinnerTheme" parent="android:Widget.Spinner">
- <item name="android:background">@drawable/stroked_round_drawable</item>
- <item name="android:textColor">@color/white</item>
- </style>
 
 </resources>

gradle.properties

@@ -20,5 +20,13 @@ kotlin.code.style=official
 100MS_APP_VERSION_CODE=376
 100MS_APP_VERSION_NAME=5.0.10
 hmsRoomKitGroup=live.100ms
-HMS_ROOM_KIT_VERSION=1.2.16
+HMS_ROOM_KIT_VERSION=1.2.17
 android.suppressUnsupportedCompileSdk=33
+HMS_SDK_VERSION=2.9.64
+# Common publishing info
+publishing_licence_name="MIT License"
+publishing_licence_url="http://www.opensource.org/licenses/mit-license.php"
+publishing_project_url="live.100ms"
+publishing_developer_id="1"
+publishing_developer_name = "100ms"
+publishing_developer_email = "[email protected]"

prebuilt-themes/.gitignore

@@ -0,0 +1 @@
+/build

prebuilt-themes/build.gradle.kts

@@ -0,0 +1,101 @@
+plugins {
+ id("com.android.library")
+ id("org.jetbrains.kotlin.android")
+ id("maven-publish")
+ id("signing")
+ id("org.jetbrains.dokka") version "1.5.0"
+}
+
+android {
+ namespace = "live.hms.prebuilt_themes"
+ compileSdk = 34
+
+ defaultConfig {
+ minSdk = 21
+
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+ consumerProguardFiles("consumer-rules.pro")
+ }
+
+ buildTypes {
+ release {
+ isMinifyEnabled = false
+ proguardFiles(
+ getDefaultProguardFile("proguard-android-optimize.txt"),
+ "proguard-rules.pro"
+ )
+ }
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+ }
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+}
+
+dependencies {
+ val HMS_SDK_VERSION: String by project
+ implementation("live.100ms:android-sdk:$HMS_SDK_VERSION")
+ implementation("com.google.code.gson:gson:2.9.0")
+ implementation("androidx.core:core-ktx:1.12.0")
+ implementation("androidx.appcompat:appcompat:1.6.1")
+ implementation("com.google.android.material:material:1.10.0")
+ implementation(platform("androidx.compose:compose-bom:2024.06.00"))
+ implementation("androidx.compose.ui:ui-android:1.6.8")
+ testImplementation("junit:junit:4.13.2")
+ androidTestImplementation("androidx.test.ext:junit:1.2.1")
+ androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
+}
+
+val HMS_ROOM_KIT_VERSION : String by project
+val publishing_licence_url : String by project
+val publishing_licence_name : String by project
+val publishing_project_url : String by project
+val publishing_developer_id : String by project
+val publishing_developer_name : String by project
+val publishing_developer_email : String by project
+publishing {
+ publications {
+ register<MavenPublication>("release") {
+ groupId = "live.100ms.room-kit"
+ artifactId = "prebuilt-themes"
+ version = HMS_ROOM_KIT_VERSION
+
+ afterEvaluate {
+ from(components["release"])
+ }
+
+ pom {
+ // Avoid trying to sign local builds
+ if(rootProject.properties["ossrhUsername"] != "") {
+ signing {
+ sign(publishing.publications["release"])
+ }
+ }
+ name.set("100ms.live Android Room Kit themes")
+ description.set("Base themes for prebuilt/room-kit.")
+ url.set(publishing_project_url)
+ licenses {
+ license {
+ name.set(publishing_licence_name)
+ url.set(publishing_licence_url)
+ }
+ }
+ developers {
+ developer {
+ id.set(publishing_developer_id)
+ name.set(publishing_developer_name)
+ email.set(publishing_developer_email)
+ }
+ }
+ scm {
+ connection.set("SCM is private")
+ developerConnection.set("SCM is private")
+ url.set("https://github.com/100mslive/100ms-android")
+ }
+ }
+ }
+ }
+}

prebuilt-themes/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

prebuilt-themes/src/androidTest/java/live/hms/prebuilt_themes/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package live.hms.prebuilt_themes
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ assertEquals("live.hms.prebuilt_themes.test", appContext.packageName)
+ }
+}

prebuilt-themes/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

room-kit/src/main/java/live/hms/roomkit/ui/theme/DefaultDarkThemeColours.kt → prebuilt-themes/src/main/java/live/hms/prebuilt_themes/DefaultDarkThemeColours.kt

@@ -1,4 +1,4 @@
-package live.hms.roomkit.ui.theme
+package live.hms.prebuilt_themes
 
 import com.google.gson.annotations.SerializedName