Tools module for common utility classes

medialibrary/build.gradle

@@ -66,4 +66,5 @@ dependencies {
     api "com.android.support:support-compat:$rootProject.ext.appCompatVersion"
     api "com.android.support:support-fragment:$rootProject.ext.appCompatVersion"
     testImplementation 'junit:junit:4.12'
+    implementation project(':tools')
 }

medialibrary/src/org/videolan/medialibrary/Medialibrary.java

@@ -36,6 +36,8 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
+import videolan.org.commontools.LiveEvent;
+
 public class Medialibrary {
     private static final String TAG = "VLC/JMedialibrary";
 
@@ -536,7 +538,7 @@ public class Medialibrary {
         }
     }
 
-    public static LiveData<MediaWrapper> lastThumb = new MutableLiveData<>();
+    public static LiveData<MediaWrapper> lastThumb = new LiveEvent<>();
     @SuppressWarnings({"unused", "unchecked"})
     void onMediaThumbnailReady(MediaWrapper media, boolean success) {
         if (success) ((MutableLiveData)lastThumb).postValue(media);

settings.gradle

@@ -1,3 +1,3 @@
-include ':libvlc', ':api', ':axmlrpc', ':medialibrary'
+include ':libvlc', ':api', ':axmlrpc', ':medialibrary', ':tools'
 include ':vlc-android'
 project(':axmlrpc').projectDir = new File('java-libs/axmlrpc')

tools/.gitignore

@@ -0,0 +1 @@
+/build

tools/build.gradle

@@ -0,0 +1,41 @@
+apply plugin: 'com.android.feature'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 27
+
+
+    baseFeature true
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 27
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    api 'com.android.support:appcompat-v7:27.1.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    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'
+    application project(':vlc-android')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
+}

tools/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

tools/src/androidTest/java/videolan/org/commontools/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package videolan.org.commontools;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("videolan.org.commontools.test", appContext.getPackageName());
+    }
+}

tools/src/main/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="videolan.org.commontools"
+    android:versionCode="2"
+    android:versionName="3.0.0" >
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
+
+</manifest>

vlc-android/src/org/videolan/vlc/util/LiveEvent.kt → tools/src/main/java/videolan/org/commontools/LiveEvent.kt

@@ -1,4 +1,4 @@
-package org.videolan.vlc.util
+package videolan.org.commontools
 
 import android.arch.lifecycle.LifecycleOwner
 import android.arch.lifecycle.MutableLiveData

tools/src/test/java/videolan/org/commontools/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package videolan.org.commontools;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}

vlc-android/build.gradle

@@ -204,9 +204,9 @@ dependencies {
     kapt "com.android.databinding:compiler:$rootProject.ext.android_plugin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$rootProject.ext.kotlinx_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$rootProject.ext.kotlinx_version"
-
     implementation "android.arch.lifecycle:extensions:$rootProject.ext.archVersion"
     kapt "android.arch.lifecycle:compiler:$rootProject.ext.archVersion"
+    implementation project(':tools')
 }
 
 kotlin {