Skip to content

Commit 00d602c

Browse files
PratimMallickPratimMallick
authored
Merge pull request #756 from 100mslive/dev
dev
2 parents 24ebcfa + 59ff22d commit 00d602c

File tree

114 files changed

+3219
-1088
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+3219
-1088
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ dependencies {
6161
//100ms.live prebuilt lib
6262
implementation "live.100ms:room-kit:$HMS_ROOM_KIT_VERSION"
6363

64+
implementation "live.100ms:virtual-background:$HMS_SDK_VERSION"
6465
//100ms noise cancellation dep
65-
def hmsVersion = "2.9.62"
66-
implementation "live.100ms:hms-noise-cancellation-android:$hmsVersion"
66+
implementation "live.100ms:hms-noise-cancellation-android:$HMS_SDK_VERSION"
6767

6868
// Navigation
6969
implementation "androidx.navigation:navigation-fragment-ktx:2.4.0"

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
android:label="@string/app_name"
2424
android:roundIcon="@mipmap/ic_launcher_round"
2525
android:supportsRtl="false"
26-
android:theme="@style/Theme.App2">
26+
android:theme="@style/Theme.HmsHomeApp">
2727
<activity
2828
android:name=".ui.home.QrCodeActivity"
2929
android:exported="false" />
3030
<activity
3131
android:name=".ui.home.HomeActivity"
3232
android:exported="true"
3333
android:label="@string/app_name"
34+
android:theme="@style/Theme.HmsHomeApp.NoActionBar"
3435
android:screenOrientation="portrait"
35-
android:theme="@style/Theme.App2.NoActionBar"
3636
android:windowSoftInputMode="stateAlwaysHidden|adjustResize">
3737
<intent-filter android:exported="true">
3838
<action android:name="android.intent.action.MAIN" />

‎app/src/main/res/drawable/stroked_drawable.xml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎app/src/main/res/drawable/stroked_round_drawable.xml‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎app/src/main/res/drawable/thick_stroked_drawable.xml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<string name="share_link">Share Link</string>
4242
<string name="more_options">More Options</string>
4343
<string name="meeting_options">Meeting Options</string>
44-
<string name="meeting">Meeting</string>
4544
<string name="open_chat">Open Chat</string>
4645
<string name="share_screen">Share Screen</string>
4746
<string name="stop_share_screen">Stop Share Screen</string>

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

Lines changed: 0 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,3 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
2-
<!-- Base application theme. -->
3-
<style name="Theme.App2" parent="Theme.MaterialComponents">
4-
<!-- Primary brand color. -->
5-
<item name="colorPrimary">@color/blue_1</item>
6-
<item name="colorPrimaryVariant">@color/primary_bg</item>
7-
<item name="colorOnPrimary">@color/white</item>
8-
9-
<!-- Secondary brand color. -->
10-
<item name="colorAccent">@color/primary_blue</item>
11-
<item name="colorSecondary">@color/primary_blue</item>
12-
<item name="colorSecondaryVariant">@color/blue_3</item>
13-
<item name="colorOnSecondary">@color/white</item>
14-
15-
<!-- Status bar color. -->
16-
<item name="android:statusBarColor" >@color/primary_bg</item>
17-
18-
<!-- Cards, Background etc -->
19-
<item name="colorSurface">@color/blue_3</item>
20-
21-
<!-- Overflow Menu -->
22-
<item name="android:itemBackground">@color/blue_3</item>
23-
24-
<!-- Default Background Color -->
25-
<item name="android:colorBackground">@color/blue_0</item>
26-
27-
<item name="colorOnSurface">@android:color/white</item>
28-
<item name="colorOnBackground">@android:color/white</item>
29-
<item name="colorOnPrimarySurface">@android:color/white</item>
30-
31-
<item name="fontFamily">@font/clan_pro_news</item>
32-
</style>
33-
34-
<style name="Theme.App2.NoActionBar">
35-
<item name="windowActionBar">false</item>
36-
<item name="windowNoTitle">true</item>
37-
</style>
38-
39-
<style name="TextInputLayout" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
40-
<item name="android:layout_marginTop">6dp</item>
41-
<item name="android:layout_marginBottom">6dp</item>
42-
<item name="boxStrokeWidth">0dp</item>
43-
<item name="hintEnabled">false</item>
44-
<item name="boxStrokeWidthFocused">0dp</item>
45-
<item name="boxBackgroundColor">@color/blue_4</item>
46-
<item name="android:textColorHint">@color/white_faded_30</item>
47-
<item name="hintTextColor">@color/white</item>
48-
<item name="endIconMode">clear_text</item>
49-
</style>
50-
51-
<style name="AutoCompleteTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
52-
<item name="android:layout_marginTop">6dp</item>
53-
<item name="android:layout_marginBottom">6dp</item>
54-
<item name="hintEnabled">true</item>
55-
<item name="boxStrokeWidth">0dp</item>
56-
<item name="boxStrokeWidthFocused">0dp</item>
57-
<item name="boxBackgroundColor">@color/blue_4</item>
58-
<item name="android:textColorHint">@color/white_faded_30</item>
59-
<item name="hintTextColor">@color/white</item>
60-
</style>
61-
62-
<style name="MaterialButton" parent="Widget.MaterialComponents.Button">
63-
<item name="android:textColor">@color/white</item>
64-
<item name="fontFamily">@font/clan_pro_medium</item>
65-
</style>
66-
67-
<style name="MaterialTextButton" parent="Widget.MaterialComponents.Button.TextButton">
68-
<item name="android:textColor">@color/text_color</item>
69-
<item name="fontFamily">@font/clan_pro_medium</item>
70-
</style>
71-
72-
<style name="MaterialTextViewHeading" parent="Widget.MaterialComponents.TextView">
73-
<item name="android:textColor">@color/white</item>
74-
<item name="fontFamily">@font/clan_pro_medium</item>
75-
</style>
76-
77-
<style name="MaterialSwitch" parent="Widget.AppCompat.CompoundButton.Switch">
78-
<item name="thumbTint">@color/white</item>
79-
</style>
80-
81-
<style name="MaterialImageButton" parent="Widget.MaterialComponents.Button.TextButton">
82-
<item name="android:layout_width">wrap_content</item>
83-
<item name="android:layout_weight">1</item>
84-
<item name="android:layout_height">wrap_content</item>
85-
<item name="android:layout_gravity">center</item>
86-
<item name="android:gravity">center</item>
87-
<item name="android:padding">8dp</item>
88-
<item name="android:clickable">true</item>
89-
<item name="android:layout_margin">0dp</item>
90-
<item name="android:inset">0dp</item>
91-
<item name="iconGravity">textStart</item>
92-
<item name="iconTint">@color/white</item>
93-
</style>
94-
95-
<style name="RoleChangeAlertDialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
96-
<item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
97-
<item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
98-
</style>
99-
100-
<style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
101-
<item name="android:textColor">#ffff</item>
102-
</style>
103-
104-
<style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
105-
<item name="android:textColor">#ffff</item>
106-
</style>
107-
108-
<style name="SpinnerTheme" parent="android:Widget.Spinner">
109-
<item name="android:background">@drawable/stroked_round_drawable</item>
110-
<item name="android:textColor">@color/white</item>
111-
</style>
1122

1133
</resources>

‎gradle.properties‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,13 @@ kotlin.code.style=official
2020
100MS_APP_VERSION_CODE=376
2121
100MS_APP_VERSION_NAME=5.0.10
2222
hmsRoomKitGroup=live.100ms
23-
HMS_ROOM_KIT_VERSION=1.2.16
23+
HMS_ROOM_KIT_VERSION=1.2.17
2424
android.suppressUnsupportedCompileSdk=33
25+
HMS_SDK_VERSION=2.9.64
26+
# Common publishing info
27+
publishing_licence_name="MIT License"
28+
publishing_licence_url="http://www.opensource.org/licenses/mit-license.php"
29+
publishing_project_url="live.100ms"
30+
publishing_developer_id="1"
31+
publishing_developer_name = "100ms"
32+
publishing_developer_email = "support@100ms.live"

‎prebuilt-themes/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎prebuilt-themes/build.gradle.kts‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
plugins {
2+
id("com.android.library")
3+
id("org.jetbrains.kotlin.android")
4+
id("maven-publish")
5+
id("signing")
6+
id("org.jetbrains.dokka") version "1.5.0"
7+
}
8+
9+
android {
10+
namespace = "live.hms.prebuilt_themes"
11+
compileSdk = 34
12+
13+
defaultConfig {
14+
minSdk = 21
15+
16+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
17+
consumerProguardFiles("consumer-rules.pro")
18+
}
19+
20+
buildTypes {
21+
release {
22+
isMinifyEnabled = false
23+
proguardFiles(
24+
getDefaultProguardFile("proguard-android-optimize.txt"),
25+
"proguard-rules.pro"
26+
)
27+
}
28+
}
29+
compileOptions {
30+
sourceCompatibility = JavaVersion.VERSION_1_8
31+
targetCompatibility = JavaVersion.VERSION_1_8
32+
}
33+
kotlinOptions {
34+
jvmTarget = "1.8"
35+
}
36+
}
37+
38+
dependencies {
39+
val HMS_SDK_VERSION: String by project
40+
implementation("live.100ms:android-sdk:$HMS_SDK_VERSION")
41+
implementation("com.google.code.gson:gson:2.9.0")
42+
implementation("androidx.core:core-ktx:1.12.0")
43+
implementation("androidx.appcompat:appcompat:1.6.1")
44+
implementation("com.google.android.material:material:1.10.0")
45+
implementation(platform("androidx.compose:compose-bom:2024.06.00"))
46+
implementation("androidx.compose.ui:ui-android:1.6.8")
47+
testImplementation("junit:junit:4.13.2")
48+
androidTestImplementation("androidx.test.ext:junit:1.2.1")
49+
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
50+
}
51+
52+
val HMS_ROOM_KIT_VERSION : String by project
53+
val publishing_licence_url : String by project
54+
val publishing_licence_name : String by project
55+
val publishing_project_url : String by project
56+
val publishing_developer_id : String by project
57+
val publishing_developer_name : String by project
58+
val publishing_developer_email : String by project
59+
publishing {
60+
publications {
61+
register<MavenPublication>("release") {
62+
groupId = "live.100ms.room-kit"
63+
artifactId = "prebuilt-themes"
64+
version = HMS_ROOM_KIT_VERSION
65+
66+
afterEvaluate {
67+
from(components["release"])
68+
}
69+
70+
pom {
71+
// Avoid trying to sign local builds
72+
if(rootProject.properties["ossrhUsername"] != "") {
73+
signing {
74+
sign(publishing.publications["release"])
75+
}
76+
}
77+
name.set("100ms.live Android Room Kit themes")
78+
description.set("Base themes for prebuilt/room-kit.")
79+
url.set(publishing_project_url)
80+
licenses {
81+
license {
82+
name.set(publishing_licence_name)
83+
url.set(publishing_licence_url)
84+
}
85+
}
86+
developers {
87+
developer {
88+
id.set(publishing_developer_id)
89+
name.set(publishing_developer_name)
90+
email.set(publishing_developer_email)
91+
}
92+
}
93+
scm {
94+
connection.set("SCM is private")
95+
developerConnection.set("SCM is private")
96+
url.set("https://github.com/100mslive/100ms-android")
97+
}
98+
}
99+
}
100+
}
101+
}

0 commit comments

Comments
 (0)