Skip to content

Commit 7c0b111

Browse files
authored
Merge pull request #6 from dji-sdk/beta_releases/v0.3.0
Added code for beta 3 release
2 parents f78ba33 + 6d7b19f commit 7c0b111

636 files changed

Lines changed: 30808 additions & 9725 deletions

File tree

Some content is hidden

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

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ sudo: required
33

44
env:
55
global:
6-
- ANDROID_API_LEVEL=28
7-
- ANDROID_BUILD_TOOLS_VERSION=28.0.3
6+
- ANDROID_API_LEVEL=29
7+
- ANDROID_BUILD_TOOLS_VERSION=29.0.1
88
- ANDROID_ABI=armeabi-v7a
99

1010
android:
@@ -20,8 +20,8 @@ android:
2020

2121
before_install:
2222
- touch $HOME/.android/repositories.cfg
23-
- yes | sdkmanager "platforms;android-28"
24-
- yes | sdkmanager "build-tools;28.0.3"
23+
- yes | sdkmanager "platforms;android-29"
24+
- yes | sdkmanager "build-tools;29.0.1"
2525

2626
before_cache:
2727
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018-2019 DJI
3+
Copyright (c) 2018-2020 DJI
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ With the UX SDK 5.0 version we are introducing an easy way to customize all the
88

99
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).
1010

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

1312
## Installation
1413

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

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

2625
## How to Contribute
2726

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

3534
## Future Plans
3635

37-
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.
38-
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***.
36+
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.
37+
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***.
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
/*
2+
* Copyright (c) 2018-2020 DJI
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy
5+
* of this software and associated documentation files (the "Software"), to deal
6+
* in the Software without restriction, including without limitation the rights
7+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
* copies of the Software, and to permit persons to whom the Software is
9+
* furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in all
12+
* copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
* SOFTWARE.
21+
*/
22+
23+
apply plugin: 'com.android.library'
24+
apply plugin: 'kotlin-android'
25+
26+
android {
27+
lintOptions {
28+
abortOnError = false
29+
}
30+
compileSdkVersion 29
31+
buildToolsVersion "29.0.1"
32+
publishNonDefault true
33+
resourcePrefix "uxsdk_"
34+
defaultConfig {
35+
minSdkVersion 19
36+
targetSdkVersion 29
37+
versionCode 1
38+
versionName "4.5"
39+
vectorDrawables.useSupportLibrary = true
40+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
41+
}
42+
buildTypes {
43+
release {
44+
minifyEnabled false
45+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
46+
}
47+
mock {
48+
debuggable true
49+
}
50+
bridge {
51+
debuggable true
52+
}
53+
}
54+
compileOptions {
55+
targetCompatibility 1.8
56+
sourceCompatibility 1.8
57+
}
58+
testOptions {
59+
unitTests.returnDefaultValues = true
60+
}
61+
testBuildType "debug"
62+
aaptOptions {
63+
// PNG optimization
64+
cruncherEnabled true
65+
}
66+
}
67+
68+
dependencies {
69+
api project(path: ':android-uxsdk-beta-core')
70+
71+
implementation ('com.dji:dji-sdk:4.12', {
72+
/**
73+
* Comment the "library-anti-distortion" if your app needs Anti Distortion for Mavic 2 Pro
74+
* and Mavic 2 Zoom.
75+
* Comment the "fly-safe-database" if you don't need a smaller apk for release. When
76+
* uncommented, we will download it when DJISDKManager.getInstance().registerApp
77+
* is called, and it won't register success without fly-safe-database.
78+
* Both will greatly reduce the size of the APK.
79+
*/
80+
exclude module: 'library-anti-distortion'
81+
exclude module: 'fly-safe-database'
82+
})
83+
compileOnly ('com.dji:dji-sdk-provided:4.12')
84+
85+
implementation 'androidx.multidex:multidex:2.0.0'
86+
implementation 'androidx.appcompat:appcompat:1.0.0'
87+
implementation 'androidx.annotation:annotation:1.0.0'
88+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
89+
implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
90+
implementation 'androidx.media:media:1.0.0'
91+
92+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
93+
}
94+
repositories {
95+
mavenCentral()
96+
}
File renamed without changes.

android-uxsdk-beta/src/main/res/values/themes.xml renamed to android-uxsdk-beta-cameracore/src/main/AndroidManifest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<!--
3-
~ Copyright (c) 2018-2019 DJI
2+
~ Copyright (c) 2018-2020 DJI
43
~
54
~ Permission is hereby granted, free of charge, to any person obtaining a copy
65
~ of this software and associated documentation files (the "Software"), to deal
@@ -19,6 +18,7 @@
1918
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2019
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2120
~ SOFTWARE.
21+
~
22+
~
2223
-->
23-
24-
<resources></resources>
24+
<manifest package="dji.ux.beta.cameracore" />

android-uxsdk-beta/src/main/java/dji/ux/beta/ui/ProgressRingView.java renamed to android-uxsdk-beta-cameracore/src/main/java/dji/ux/beta/cameracore/ui/ProgressRingView.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018-2019 DJI
2+
* Copyright (c) 2018-2020 DJI
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy
55
* of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
2020
* SOFTWARE.
2121
*/
2222

23-
package dji.ux.beta.ui;
23+
package dji.ux.beta.cameracore.ui;
2424

2525
import android.content.Context;
2626
import android.graphics.Canvas;
@@ -36,7 +36,7 @@
3636

3737
import androidx.annotation.ColorInt;
3838

39-
import dji.ux.beta.R;
39+
import dji.ux.beta.cameracore.R;
4040

4141
public class ProgressRingView extends View {
4242

0 commit comments

Comments
 (0)