Android X Migration SDK DOWN TO 19

AsynctaskCoffee · AsynctaskCoffee · commit 3938fa9a1b3a · 2020-07-14T03:46:01.000+03:00
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -29,10 +29,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     implementation project(':videolayout')
 }
diff --git a/app/src/androidTest/java/egolabsapps/basicodemine/videolayout/ExampleInstrumentedTest.kt b/app/src/androidTest/java/egolabsapps/basicodemine/videolayout/ExampleInstrumentedTest.kt
@@ -1,7 +1,7 @@
 package egolabsapps.basicodemine.videolayout
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
 
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -17,8 +17,7 @@ import org.junit.Assert.*
 class ExampleInstrumentedTest {
     @Test
     fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getTargetContext()
+        val appContext = InstrumentationRegistry.getInstrumentation().context
         assertEquals("egolabsapps.basicodemine.videolayout", appContext.packageName)
     }
 }
diff --git a/app/src/main/java/egolabsapps/basicodemine/videolayout/Main2Activity.kt b/app/src/main/java/egolabsapps/basicodemine/videolayout/Main2Activity.kt
@@ -1,6 +1,6 @@
 package egolabsapps.basicodemine.videolayout
 
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.FrameLayout
 
diff --git a/app/src/main/java/egolabsapps/basicodemine/videolayout/MainActivity.kt b/app/src/main/java/egolabsapps/basicodemine/videolayout/MainActivity.kt
@@ -1,7 +1,7 @@
 package egolabsapps.basicodemine.videolayout
 
 import android.content.Intent
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Handler
 import android.view.View
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.3.72'
     ext.kotlin_version = '1.3.21'
     repositories {
         google()
diff --git a/gradle.properties b/gradle.properties
@@ -13,3 +13,5 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/videolayout/build.gradle b/videolayout/build.gradle
@@ -1,17 +1,18 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
 
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion 19
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -31,8 +32,13 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation "androidx.core:core-ktx:1.3.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
 }
diff --git a/videolayout/src/androidTest/java/egolabsapps/basicodemine/videolayout/ExampleInstrumentedTest.java b/videolayout/src/androidTest/java/egolabsapps/basicodemine/videolayout/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package egolabsapps.basicodemine.videolayout;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/videolayout/src/main/java/egolabsapps/basicodemine/videolayout/VideoLayout.java b/videolayout/src/main/java/egolabsapps/basicodemine/videolayout/VideoLayout.java
@@ -7,10 +7,11 @@
 import android.graphics.SurfaceTexture;
 import android.media.MediaMetadataRetriever;
 import android.media.MediaPlayer;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.Surface;
 import android.view.TextureView;
 import android.widget.FrameLayout;
@@ -45,7 +46,6 @@ public int getValue() {
                 case start:
                     return 0;
                 case centerCrop:
-                    return 2;
                 default:
                     return 2;
             }
@@ -111,11 +111,7 @@ private void calculateVideoSize() {
             mVideoHeight = Float.parseFloat(height);
             mVideoWidth = Float.parseFloat(width);
             metaRetriever.release();
-        } catch (IOException e) {
-            Log.d(TAG, e.getMessage());
-            e.printStackTrace();
-        } catch (NumberFormatException e) {
-            Log.d(TAG, e.getMessage());
+        } catch (IOException | NumberFormatException e) {
             e.printStackTrace();
         }
     }
@@ -153,7 +149,7 @@ private void surfaceSetup() {
         updateTextureViewSize(screenWidth, screenHeight);
     }
 
-    private void surfaceAvaibleWorkers(SurfaceTexture surfaceTexture) {
+    private void surfaceAvailableWorkers(SurfaceTexture surfaceTexture) {
         Surface surface = new Surface(surfaceTexture);
 
         try {
@@ -170,13 +166,7 @@ private void surfaceAvaibleWorkers(SurfaceTexture surfaceTexture) {
             mMediaPlayer.prepareAsync();
             mMediaPlayer.setOnPreparedListener(MediaPlayer::start);
 
-        } catch (IllegalArgumentException ignored) {
-
-        } catch (SecurityException ignored) {
-
-        } catch (IllegalStateException ignored) {
-
-        } catch (IOException ignored) {
+        } catch (IllegalArgumentException | SecurityException | IllegalStateException | IOException ignored) {
 
         }
     }
@@ -199,20 +189,14 @@ private void changeVideo() {
             mMediaPlayer.prepareAsync();
             mMediaPlayer.setOnPreparedListener(MediaPlayer::start);
 
-        } catch (IllegalArgumentException ignored) {
-
-        } catch (SecurityException ignored) {
-
-        } catch (IllegalStateException ignored) {
-
-        } catch (IOException ignored) {
+        } catch (IllegalArgumentException | IOException | IllegalStateException | SecurityException ignored) {
 
         }
     }
 
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        surfaceAvaibleWorkers(surface);
+        surfaceAvailableWorkers(surface);
     }
 
     @Override
@@ -236,7 +220,6 @@ public void onDestroyVideoLayout() {
                 mMediaPlayer.release();
                 mMediaPlayer = null;
             } catch (IllegalStateException e) {
-                Log.d(TAG, e.getMessage());
             }
 
         }
