Skip to content

Commit 39a3859

Browse files
committed
Move Sample App
1 parent 95741b8 commit 39a3859

File tree

7 files changed

+14
-17
lines changed

7 files changed

+14
-17
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/.idea
22
dailymotion-player-sdk-android.iml
3-
3+
/.kinta
44
/local.properties
55
/build
66
/*/build

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
maven { url 'http://repo1.maven.org/maven2' }
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.6.1'
10+
classpath 'com.android.tools.build:gradle:4.1.2'
1111
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
1212
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jan 22 16:56:03 CET 2019
1+
#Mon Feb 01 14:48:02 CET 2021
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

sampleapp/src/androidTest/java/com/dailymotion/android/player/sampleapp/LoadPauseTest.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.dailymotion.android.player.sampleapp
22

33
import androidx.test.ext.junit.runners.AndroidJUnit4
44
import androidx.test.rule.ActivityTestRule
5+
import com.sampleapp.dailymotion.SampleActivity
56
import kotlinx.android.synthetic.main.new_screen_sample.*
67
import org.junit.Assert
78
import org.junit.Rule
@@ -19,13 +20,13 @@ class LoadPauseTest {
1920
val activity = testRule.activity
2021

2122
activity.runOnUiThread {
22-
activity.playerWebview.load("x26hv6c")
23-
activity.playerWebview.pause()
23+
activity.playerWebView.load("x26hv6c")
24+
activity.playerWebView.pause()
2425
}
2526
Thread.sleep(10000)
2627
activity.runOnUiThread {
27-
if (activity.playerWebview.position >= 1000) {
28-
Assert.fail("Pause() failed: ${activity.playerWebview.position}ms >= 1000ms")
28+
if (activity.playerWebView.position >= 1000) {
29+
Assert.fail("Pause() failed: ${activity.playerWebView.position}ms >= 1000ms")
2930
}
3031
}
3132
}

sampleapp/src/main/AndroidManifest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest
33
xmlns:android="http://schemas.android.com/apk/res/android"
4-
package="com.dailymotion.websdksample"
4+
package="com.sampleapp.dailymotion"
55
android:versionCode="1"
66
android:versionName="1.0">
77

88
<uses-permission android:name="android.permission.INTERNET"/>
99

1010
<application
11-
android:name="com.dailymotion.android.player.sampleapp.MyApp"
11+
android:name="com.sampleapp.dailymotion.MyApp"
1212
android:allowBackup="true"
1313
android:hardwareAccelerated="true"
1414
android:icon="@drawable/ic_launcher"
@@ -17,7 +17,7 @@
1717
android:theme="@style/AppTheme">
1818

1919
<activity
20-
android:name="com.dailymotion.android.player.sampleapp.SampleActivity"
20+
android:name="com.sampleapp.dailymotion.SampleActivity"
2121
android:configChanges="orientation|screenSize"
2222
android:windowSoftInputMode="adjustPan"
2323
android:label="@string/app_name">

sampleapp/src/main/java/com/dailymotion/android/player/sampleapp/MyApp.kt renamed to sampleapp/src/main/java/com/sampleapp/dailymotion/MyApp.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
package com.dailymotion.android.player.sampleapp
1+
package com.sampleapp.dailymotion
22

33
import android.app.Application
44

5-
import com.dailymotion.websdksample.BuildConfig
6-
75
import timber.log.Timber
86

97
/**

sampleapp/src/main/java/com/dailymotion/android/player/sampleapp/SampleActivity.kt renamed to sampleapp/src/main/java/com/sampleapp/dailymotion/SampleActivity.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.dailymotion.android.player.sampleapp
1+
package com.sampleapp.dailymotion
22

33
import android.annotation.SuppressLint
44
import android.annotation.TargetApi
@@ -23,8 +23,6 @@ import androidx.core.content.ContextCompat
2323
import com.dailymotion.android.player.sdk.PlayerWebView
2424
import com.dailymotion.android.player.sdk.TCF2Handler
2525
import com.dailymotion.android.player.sdk.events.*
26-
import com.dailymotion.websdksample.BuildConfig
27-
import com.dailymotion.websdksample.R
2826
import kotlinx.android.synthetic.main.new_screen_sample.*
2927
import timber.log.Timber
3028
import java.text.SimpleDateFormat

0 commit comments

Comments
 (0)