Skip to content

Commit

Permalink
Rename sdk and sample app module
Browse files Browse the repository at this point in the history
  • Loading branch information
hugo committed Jun 23, 2017
1 parent 66f3ade commit 9e799f2
Show file tree
Hide file tree
Showing 86 changed files with 49 additions and 77 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@
.idea/modules.xml
.idea/vcs.xml
/DailymotionSDKAndroid/DailymotionSDKAndroid.iml
/sdk/sdk.iml
SampleApp/SampleApp.iml
sampleapp/sampleapp.iml
dailymotion-sdk-android.iml

/local.properties
/build
/DailymotionSDKAndroid/build/*
/sdk/build/*
sdl/build/
/SampleApp/build
/sampleapp/build
4 changes: 2 additions & 2 deletions .idea/gradle.xml

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

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
File renamed without changes.
2 changes: 1 addition & 1 deletion SampleApp/build.gradle → sampleapp/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'

dependencies {
compile project(':DailymotionSDKAndroid')
compile project(':sdk')
}

android {
Expand Down
File renamed without changes.
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import android.widget.Button;
import android.widget.TextView;

import com.dailymotion.sdkandroid.DMPlayerWebView;
import com.dailymotion.sdkandroid.PlayerWebView;
import com.dailymotion.websdksample.R;

import java.util.HashMap;
Expand All @@ -19,7 +19,7 @@

public class SampleActivity extends Activity implements View.OnClickListener, FullScreenListener {

private DMPlayerWebView mVideoView;
private PlayerWebView mVideoView;
private TextView mLogText;
private boolean mFullscreen = false;

Expand All @@ -46,10 +46,10 @@ protected void onCreate(Bundle savedInstanceState) {
Timber.plant(new Timber.DebugTree());
setContentView(R.layout.new_screen_sample);

mVideoView = (DMPlayerWebView) findViewById(R.id.dm_player_web_view);
mVideoView = (PlayerWebView) findViewById(R.id.dm_player_web_view);
mVideoView.playVideo("x26hv6c");

mVideoView.setEventListener(new DMPlayerWebView.EventListener() {
mVideoView.setEventListener(new PlayerWebView.EventListener() {
@Override
public void onEvent(String event, HashMap<String, String> map) {
switch (event) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
android:layout_height="match_parent"
tools:context=".SampleActivity">

<com.dailymotion.sdkandroid.DMPlayerWebView
<com.dailymotion.sdkandroid.PlayerWebView
android:id="@+id/dm_player_web_view"
android:layout_width="match_parent"
android:layout_height="215dp">
</com.dailymotion.sdkandroid.DMPlayerWebView>
</com.dailymotion.sdkandroid.PlayerWebView>

<Button
android:id="@+id/btnHideControls"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion DailymotionSDKAndroid/build.gradle → sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ext {
siteUrl = 'https://github.com/dailymotion/dailymotion-sdk-android'
gitUrl = 'https://github.com/dailymotion/dailymotion-sdk-android.git'

libraryVersion = '0.1.0'
libraryVersion = '0.1.1'

developerId = 'dmandroid'
developerName = 'Dailymotion'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Fri Jun 23 10:23:47 CEST 2017
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="output$Generated" generated="true"><source path="/Users/hugo/.android/build-cache/1d6dbe1df4904c8c0bb5a5962bec2e25bd534137/output/res"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/intermediates/bundles/debug/res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/androidTest/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/androidTest/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/androidTest/debug"/></dataSet><dataSet config="output" from-dependency="true" generated-set="output$Generated"><source path="/Users/hugo/.android/build-cache/1d6dbe1df4904c8c0bb5a5962bec2e25bd534137/output/res"/></dataSet><dataSet config="debug" from-dependency="true" generated-set="debug$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/intermediates/bundles/debug/res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/androidTest/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/androidTest/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/androidTest/debug"/></dataSet><mergedItems/></merger>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/assets"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/assets/shaders/debug"/></dataSet><dataSet config="debug"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/assets"/></dataSet></merger>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Fri Jun 23 10:23:47 CEST 2017
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="output$Generated" generated="true"><source path="/Users/hugo/.android/build-cache/1d6dbe1df4904c8c0bb5a5962bec2e25bd534137/output/res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/res"/></dataSet><dataSet config="output" from-dependency="true" generated-set="output$Generated"><source path="/Users/hugo/.android/build-cache/1d6dbe1df4904c8c0bb5a5962bec2e25bd534137/output/res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/res"/></dataSet><mergedItems/></merger>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/shaders"/></dataSet><dataSet config="debug"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/shaders"/></dataSet></merger>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/assets"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/assets/shaders/release"/></dataSet><dataSet config="release"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/release/assets"/></dataSet></merger>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/shaders"/></dataSet><dataSet config="release"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/release/shaders"/></dataSet></merger>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Fri Jun 23 10:23:47 CEST 2017
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/main/res"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/rs/debug"/><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="/Users/hugo/Dev/dailymotion/dailymotion-sdk-android/sdk/src/debug/res"/></dataSet><mergedItems/></merger>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Fri Jun 23 10:23:47 CEST 2017
Loading

0 comments on commit 9e799f2

Please sign in to comment.