Skip to content

Commit

Permalink
Merge pull request #6 from dji-sdk/beta_releases/v0.3.0
Browse files Browse the repository at this point in the history
Added code for beta 3 release
  • Loading branch information
siddutgikar committed May 12, 2020
2 parents f78ba33 + 6d7b19f commit 7c0b111
Show file tree
Hide file tree
Showing 636 changed files with 30,808 additions and 9,725 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Expand Up @@ -3,8 +3,8 @@ sudo: required

env:
global:
- ANDROID_API_LEVEL=28
- ANDROID_BUILD_TOOLS_VERSION=28.0.3
- ANDROID_API_LEVEL=29
- ANDROID_BUILD_TOOLS_VERSION=29.0.1
- ANDROID_ABI=armeabi-v7a

android:
Expand All @@ -20,8 +20,8 @@ android:

before_install:
- touch $HOME/.android/repositories.cfg
- yes | sdkmanager "platforms;android-28"
- yes | sdkmanager "build-tools;28.0.3"
- yes | sdkmanager "platforms;android-29"
- yes | sdkmanager "build-tools;29.0.1"

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018-2019 DJI
Copyright (c) 2018-2020 DJI

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
15 changes: 7 additions & 8 deletions README.md
Expand Up @@ -8,7 +8,6 @@ With the UX SDK 5.0 version we are introducing an easy way to customize all the

Check out our sample app code in this repository with instructions on how to get started [here](https://github.com/dji-sdk/Mobile-UXSDK-Beta-Android/wiki/Sample-Application-Tutorial).

**NOTE:** UX SDK 5.0 Beta 3 is coming this month, May 2020, with more updates and support for MSDK 4.12.

## Installation

Expand All @@ -17,11 +16,11 @@ Read the [documentation for installation](https://github.com/dji-sdk/Mobile-UXSD
## Documentation

You can find the UX SDK documentation on the [wiki](https://github.com/dji-sdk/Mobile-UXSDK-Beta-Android/wiki). This includes -
* UX SDK 5.0 overview and main concepts
* Documentation for all the individual widgets
* Sample app tutorial
* Contribution guidelines
* Where to get support
* [UX SDK 5.0 overview and main concepts](https://github.com/dji-sdk/Mobile-UXSDK-Beta-Android/wiki/UX-SDK-5.0-Overview)
* [Documentation for all the individual widgets](https://github.com/dji-sdk/Mobile-UXSDK-Beta-Android/wiki/UX-SDK-Modules)
* [Sample app tutorial](https://github.com/dji-sdk/Mobile-UXSDK-Beta-Android/wiki/Sample-Application-Tutorial)
* [Contribution guidelines](https://github.com/dji-sdk/Mobile-UXSDK-Beta-Android/wiki/How-to-Contribute)
* [Where to get support](https://github.com/dji-sdk/Mobile-UXSDK-Beta-Android/wiki/How-to-Contribute#Support)

## How to Contribute

Expand All @@ -34,5 +33,5 @@ Mobile-UXSDK-Beta-Android is available under the the MIT license. Please see the

## Future Plans

We are eager to give you a sneak peek, and are very interested in receiving your feedback and suggestions. Please refer to the wiki or the release notes for the full list of elements that the Beta 2 version makes available.
Our long-term plan is for this framework to reach feature parity with the UX SDK 4.11 release. The core team is currently working on porting the remaining widgets and other APIs to the new architecture and we will open source them in additional future Beta releases as they are completed. We welcome your feedback on the architecture and your ideas for additional widgets, including those not included in prior UX SDK releases, as well as your contributions and PRs for any ***currently open-sourced features***.
We are eager to give you a sneak peek, and are very interested in receiving your feedback and suggestions. Please refer to the wiki or the release notes for the full list of elements that the Beta 3 version makes available.
Our long-term plan is for this framework to reach feature parity with the UX SDK 4.12 release. The core team is currently working on porting the remaining widgets and other APIs to the new architecture and we will open source them in additional future Beta releases as they are completed. We welcome your feedback on the architecture and your ideas for additional widgets, including those not included in prior UX SDK releases, as well as your contributions and PRs for any ***currently open-sourced features***.
96 changes: 96 additions & 0 deletions android-uxsdk-beta-cameracore/build.gradle
@@ -0,0 +1,96 @@
/*
* Copyright (c) 2018-2020 DJI
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
lintOptions {
abortOnError = false
}
compileSdkVersion 29
buildToolsVersion "29.0.1"
publishNonDefault true
resourcePrefix "uxsdk_"
defaultConfig {
minSdkVersion 19
targetSdkVersion 29
versionCode 1
versionName "4.5"
vectorDrawables.useSupportLibrary = true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
mock {
debuggable true
}
bridge {
debuggable true
}
}
compileOptions {
targetCompatibility 1.8
sourceCompatibility 1.8
}
testOptions {
unitTests.returnDefaultValues = true
}
testBuildType "debug"
aaptOptions {
// PNG optimization
cruncherEnabled true
}
}

dependencies {
api project(path: ':android-uxsdk-beta-core')

implementation ('com.dji:dji-sdk:4.12', {
/**
* Comment the "library-anti-distortion" if your app needs Anti Distortion for Mavic 2 Pro
* and Mavic 2 Zoom.
* Comment the "fly-safe-database" if you don't need a smaller apk for release. When
* uncommented, we will download it when DJISDKManager.getInstance().registerApp
* is called, and it won't register success without fly-safe-database.
* Both will greatly reduce the size of the APK.
*/
exclude module: 'library-anti-distortion'
exclude module: 'fly-safe-database'
})
compileOnly ('com.dji:dji-sdk-provided:4.12')

implementation 'androidx.multidex:multidex:2.0.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.annotation:annotation:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
implementation 'androidx.media:media:1.0.0'

implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
mavenCentral()
}
File renamed without changes.
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2018-2019 DJI
~ Copyright (c) 2018-2020 DJI
~
~ Permission is hereby granted, free of charge, to any person obtaining a copy
~ of this software and associated documentation files (the "Software"), to deal
Expand All @@ -19,6 +18,7 @@
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
~ SOFTWARE.
~
~
-->

<resources></resources>
<manifest package="dji.ux.beta.cameracore" />
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2019 DJI
* Copyright (c) 2018-2020 DJI
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand All @@ -20,7 +20,7 @@
* SOFTWARE.
*/

package dji.ux.beta.ui;
package dji.ux.beta.cameracore.ui;

import android.content.Context;
import android.graphics.Canvas;
Expand All @@ -36,7 +36,7 @@

import androidx.annotation.ColorInt;

import dji.ux.beta.R;
import dji.ux.beta.cameracore.R;

public class ProgressRingView extends View {

Expand Down

0 comments on commit 7c0b111

Please sign in to comment.