-added activity for trim

steelkiwi · Jun 15, 2020 · 350185b · 350185b
1 parent 98355c2
commit 350185b
Show file tree

Hide file tree

Showing 60 changed files with 1,337 additions and 2,094 deletions.
diff --git a/.gradle/5.2.1/fileChanges/last-build.bin b/.gradle/5.2.1/fileChanges/last-build.bin
diff --git a/.gradle/5.2.1/fileHashes/fileHashes.lock b/.gradle/5.2.1/fileHashes/fileHashes.lock
diff --git a/.gradle/5.2.1/gc.properties b/.gradle/5.2.1/gc.properties
diff --git a/.gradle/6.1.1/fileChanges/last-build.bin b/.gradle/6.1.1/fileChanges/last-build.bin
diff --git a/.gradle/6.1.1/fileHashes/fileHashes.lock b/.gradle/6.1.1/fileHashes/fileHashes.lock
diff --git a/.gradle/6.1.1/gc.properties b/.gradle/6.1.1/gc.properties
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/android/build.gradle b/android/build.gradle
@@ -19,20 +19,24 @@ rootProject.allprojects {
     repositories {
         google()
         jcenter()
+        maven { url 'https://jitpack.io' }
+
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -45,4 +49,6 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.github.AndroidDeveloperLB:VideoTrimmer:6'
+
 }
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,2 +1 @@
-include ':video_trimmer_library'
 rootProject.name = 'videotrimming'
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		include ':video_trimmer_library'
		rootProject.name = 'videotrimming'