Merge pull request #2 from CameraKit/v0.2.0

v0.2.0

Author: Dylan McIntyre

README.md

@@ -31,7 +31,7 @@ This is all done without decoding the JPEG to RGB. All operations on the JPEG ar
 Add __JpegKit__ to the dependencies block in your `app` level `build.gradle`:
 
 ```groovy		
-compile 'com.camerakit:jpegkit:0.0.1'
+compile 'com.camerakit:jpegkit:0.2.0'
 ```
 
 ## Usage

app/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.4.1)
+
+add_library(demo SHARED src/main/cpp/demo.cpp)
+
+find_library(log-lib log)
+find_library(android-lib android)
+
+target_link_libraries(demo ${log-lib} ${android-lib})

app/build.gradle

@@ -1,17 +1,37 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion = 28
+    buildToolsVersion = '28.0.0'
     defaultConfig {
-        applicationId 'com.jpegkit.app'
+        applicationId 'jpegkit.app'
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
-        versionName '0.1.0'
+        versionName '0.2.0'
+        externalNativeBuild {
+            cmake {
+                cppFlags ''
+            }
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path 'CMakeLists.txt'
+        }
     }
 }
 
+repositories {
+    jcenter()
+    google()
+}
+
 dependencies {
     implementation project(':jpegkit')
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.50'
+    implementation 'com.android.support:appcompat-v7:28.0.0-alpha3'
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jpegkit.app">
+    package="jpegkit.app">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 

jpegkit/src/main/assets/cat.jpg app/src/main/assets/cat.jpgjpegkit/src/main/assets/cat.jpg renamed to app/src/main/assets/cat.jpg

@@ -0,0 +1,5 @@
+#include <jni.h>
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_jpegkit_app_MainActivity_init(JNIEnv *env, jobject obj) {
+}

app/src/main/cpp/demo.cpp

@@ -1,4 +1,4 @@
-package com.jpegkit.app;
+package jpegkit.app;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -21,8 +21,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.jpegkit.JpegFile;
-import com.jpegkit.JpegImageView;
+import jpegkit.JpegFile;
+import jpegkit.JpegImageView;
 
 import java.util.Set;
 import java.util.TreeSet;

…n/java/com/jpegkit/app/JpegActivity.java …/main/java/jpegkit/app/JpegActivity.javaapp/src/main/java/com/jpegkit/app/JpegActivity.java renamed to app/src/main/java/jpegkit/app/JpegActivity.java app/src/main/java/com/jpegkit/app/JpegActivity.java renamed to app/src/main/java/jpegkit/app/JpegActivity.java

@@ -1,4 +1,4 @@
-package com.jpegkit.app;
+package jpegkit.app;
 
 import android.Manifest;
 import android.content.Intent;
@@ -23,9 +23,9 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.jpegkit.Jpeg;
-import com.jpegkit.JpegFile;
-import com.jpegkit.JpegImageView;
+import jpegkit.Jpeg;
+import jpegkit.JpegFile;
+import jpegkit.JpegImageView;
 
 import java.io.File;
 import java.io.FileOutputStream;

…n/java/com/jpegkit/app/MainActivity.java …/main/java/jpegkit/app/MainActivity.javaapp/src/main/java/com/jpegkit/app/MainActivity.java renamed to app/src/main/java/jpegkit/app/MainActivity.java app/src/main/java/com/jpegkit/app/MainActivity.java renamed to app/src/main/java/jpegkit/app/MainActivity.java

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="#EEEEEE">
 
-    <com.jpegkit.JpegImageView
+    <jpegkit.JpegImageView
         android:id="@+id/imageView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/activity_jpeg.xml

@@ -9,7 +9,7 @@
         android:layout_height="match_parent"
         android:orientation="horizontal">
 
-        <com.jpegkit.JpegImageView
+        <jpegkit.JpegImageView
             android:id="@+id/imageView"
             android:layout_width="80dp"
             android:layout_height="80dp"