Skip to content
This repository was archived by the owner on Jun 12, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 11 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}

// Load values from SA properties file.
def propsFile = rootProject.file('sa.properties')
def props = new Properties()
props.load(new FileInputStream(propsFile))

repositories {
mavenLocal()
// Millicast SDK via Maven from GitHub Packages
Expand All @@ -29,15 +29,15 @@ android {
keyPassword props['keyPassword']
}
}
compileSdkVersion 31
compileSdkVersion 34

defaultConfig {
applicationId "com.millicast.android_java_sdk_sa"
minSdkVersion 24
minSdkVersion 33
//noinspection ExpiredTargetSdkVersion
targetSdkVersion 28
targetSdkVersion 34
versionCode 11
versionName "1.5.2"
versionName "1.7.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand All @@ -50,9 +50,10 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
namespace 'com.millicast.android_app'
}

dependencies {
Expand All @@ -66,13 +67,15 @@ dependencies {
implementation 'androidx.navigation:navigation-ui:2.4.1'
implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'io.dolby:promise:2.9.0'
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

// Add Millicast SDK via one of the methods below.
// For download via Maven from GitHub Packages:
implementation 'com.millicast:millicast-sdk-android:1.5.2'
implementation 'com.millicast:millicast-sdk-android:1.7.0'
// For manual addition of AAR file:
// implementation project(":MillicastSDK")
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.millicast.android_app">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.CAMERA" />

Expand Down Expand Up @@ -30,7 +29,8 @@
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/Theme.Androidapp.NoActionBar">
android:theme="@style/Theme.Androidapp.NoActionBar"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/millicast/android_app/MCTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ public class MCTypes {


/**
* The type of {@link com.millicast.BitrateSettings} referred to.
* The type of {@link com.millicast.publishers.BitrateSettings} referred to.
*/
public enum Bitrate {
/**
* {@link com.millicast.BitrateSettings#minBitrateKbps}
* {@link com.millicast.publishers.BitrateSettings#minBitrateKbps}
*/
MIN,
/**
* {@link com.millicast.BitrateSettings#maxBitrateKbps}
* {@link com.millicast.publishers.BitrateSettings#maxBitrateKbps}
*/
MAX;
}
Expand Down
Loading