diff --git a/sudoku-android/README.md b/sudoku-android/README.md index a4d7310..40a6d08 100755 --- a/sudoku-android/README.md +++ b/sudoku-android/README.md @@ -25,12 +25,14 @@ Make sure you've defined the necessary properties in your settings.xml, namely android.storepass Of course, you have to create a corresponding keystore and use your own storepass. + +For example, you could place those values in your settings.xml in the SETTINGS.android profile. For upload to app store use target/sudoku-android-aligned.apk. -via the web interface of googles play store. +via the google play store web interface. diff --git a/sudoku-android/pom.xml b/sudoku-android/pom.xml index f7d2313..87ebaef 100644 --- a/sudoku-android/pom.xml +++ b/sudoku-android/pom.xml @@ -38,14 +38,16 @@ android android - 5.0.1_r2 + 6.0_r2 provided - com.google.android.admob - admob - 6.4.1-r11 + com.google.android.gms + play-services-ads + 9.2.0 + aar + @@ -58,7 +60,7 @@ scala-maven-plugin - + com.simpligility.maven.plugins android-maven-plugin @@ -75,6 +77,7 @@ true true + false @@ -103,7 +106,7 @@ org.apache.maven.plugins maven-jarsigner-plugin - 1.2 + 1.4 signing diff --git a/sudoku-android/proguard.cfg b/sudoku-android/proguard.cfg index 1d3d5f2..a3f7aaf 100644 --- a/sudoku-android/proguard.cfg +++ b/sudoku-android/proguard.cfg @@ -20,12 +20,13 @@ # for development -dontoptimize -#Keep classes that are referenced on the AndroidManifest +#Keep classes that are referenced in androidmanifest.xml -keep public class * extends android.app.Activity -keep public class * extends android.app.Application -keep public class * extends android.app.Service -keep public class * extends android.content.BroadcastReceiver -keep public class * extends android.content.ContentProvider -keep public class org.opencv.android.JavaCameraView { *; } +-keep public class com.google.android.gms.ads.Adview { *; } -keep class scala.collection.SeqLike { public protected *; } -keep public class net.ladstatt.** diff --git a/sudoku-android/src/main/AndroidManifest.xml b/sudoku-android/src/main/AndroidManifest.xml index f1a4f76..0da1b19 100755 --- a/sudoku-android/src/main/AndroidManifest.xml +++ b/sudoku-android/src/main/AndroidManifest.xml @@ -17,8 +17,10 @@ android:icon="@drawable/ic_launcher" android:label="@string/app_name"> + + + + + SFailure("No rectangle detected",SCandidate(frameNr,pipeline, SRectangle(frame, pipeline.corners,pipeline.corners),currState)) + pipeline.detectRectangle match { + case None => SFailure("No rectangle detected", SCandidate(frameNr, pipeline, SRectangle(frame, pipeline.corners, pipeline.corners), currState)) case Some(r) => val rectangle: SRectangle = SRectangle(pipeline) val (sudokuResult, nextState) = Await.result(SCandidate(frameNr, pipeline, rectangle, currState).calc, Duration.Inf)