From 191524f4db406b9f212debe50d07facfa1512aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Ladst=C3=A4tter?= <robert.ladstaetter@nextsense.at>
Date: Wed, 20 Jul 2016 22:46:42 +0200
Subject: [PATCH] showing ads now on right place, preparation for release 1.9

---
 sudoku-android/proguard.cfg                   |   1 -
 sudoku-android/src/main/AndroidManifest.xml   |  14 ++-
 .../{sudoku.xml => sudoku_frame_layout.xml}   |  22 ++--
 .../src/main/res/values-de/strings.xml        |   1 +
 .../src/main/res/values/strings.xml           |   3 +-
 .../apps/sudoku/android/SudokuCapturer.scala  | 112 ++++++++++--------
 6 files changed, 91 insertions(+), 62 deletions(-)
 rename sudoku-android/src/main/res/layout/{sudoku.xml => sudoku_frame_layout.xml} (60%)

diff --git a/sudoku-android/proguard.cfg b/sudoku-android/proguard.cfg
index a3f7aaf..614173f 100644
--- a/sudoku-android/proguard.cfg
+++ b/sudoku-android/proguard.cfg
@@ -27,6 +27,5 @@
 -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 0da1b19..05ef65c 100755
--- a/sudoku-android/src/main/AndroidManifest.xml
+++ b/sudoku-android/src/main/AndroidManifest.xml
@@ -6,8 +6,11 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://schemas.android.com/apk/res/android">
 
+    <!-- to access camera and some memory -->
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+
+    <!-- for google ads -->
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
@@ -19,9 +22,6 @@
 
         <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
 
-        <activity
-                android:name="com.google.android.gms.ads.AdActivity"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>
 
         <activity
                 android:name=".SudokuCapturer"
@@ -33,7 +33,13 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-        </activity>
+
+        </activity>                                               s
+
+        <activity
+                android:name="com.google.android.gms.ads.AdActivity"
+                android:theme="@android:style/Theme.Translucent"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>
 
     </application>
 </manifest>
diff --git a/sudoku-android/src/main/res/layout/sudoku.xml b/sudoku-android/src/main/res/layout/sudoku_frame_layout.xml
similarity index 60%
rename from sudoku-android/src/main/res/layout/sudoku.xml
rename to sudoku-android/src/main/res/layout/sudoku_frame_layout.xml
index 0f19824..44f0c85 100644
--- a/sudoku-android/src/main/res/layout/sudoku.xml
+++ b/sudoku-android/src/main/res/layout/sudoku_frame_layout.xml
@@ -4,19 +4,17 @@
              android:layout_height="match_parent"
              android:id="@+id/mainLayout">
 
-                                                   <!--
+                     <!--
     <com.google.android.gms.ads.AdView
             android:id="@+id/ad_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            ads:adSize="BANNER"
+            ads:adSize="SMART_BANNER"
             ads:adUnitId="ca-app-pub-1727389366588084/4496274256"/>
-                                                -->
-
-
+                         -->
     <org.opencv.android.JavaCameraView
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:id="@+id/sudoku"/>
 
     <Button
@@ -27,5 +25,15 @@
             android:layout_gravity="center_horizontal|bottom"
             android:paddingBottom="10dp"/>
 
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="@string/use_in_landscape_mode"
+            android:id="@+id/use_in_landscape"
+            android:layout_gravity="center_horizontal|top"
+            android:visibility="visible"
+            android:background="#000000"/>
+
 
 </FrameLayout>
diff --git a/sudoku-android/src/main/res/values-de/strings.xml b/sudoku-android/src/main/res/values-de/strings.xml
index c671410..35521a5 100644
--- a/sudoku-android/src/main/res/values-de/strings.xml
+++ b/sudoku-android/src/main/res/values-de/strings.xml
@@ -2,5 +2,6 @@
 
     <string name="app_name">Sudoku Capturer</string>
     <string name="button_rescan">neues Sudoku lösen</string>
+    <string name="use_in_landscape_mode">Handy quer halten bitte …</string>
 
 </resources>
\ No newline at end of file
diff --git a/sudoku-android/src/main/res/values/strings.xml b/sudoku-android/src/main/res/values/strings.xml
index cc6bb4d..f2549af 100755
--- a/sudoku-android/src/main/res/values/strings.xml
+++ b/sudoku-android/src/main/res/values/strings.xml
@@ -2,5 +2,6 @@
 <resources>
     <string name="app_name">Sudoku Capturer</string>
     <string name="button_rescan">rescan</string>
-
+    <string name="use_in_landscape_mode">Use in Landscape mode</string>
+    <string name="adunit_id">ca-app-pub-1727389366588084/4496274256</string>
 </resources>
diff --git a/sudoku-android/src/main/scala/net/ladstatt/apps/sudoku/android/SudokuCapturer.scala b/sudoku-android/src/main/scala/net/ladstatt/apps/sudoku/android/SudokuCapturer.scala
index 77def08..5ab4072 100644
--- a/sudoku-android/src/main/scala/net/ladstatt/apps/sudoku/android/SudokuCapturer.scala
+++ b/sudoku-android/src/main/scala/net/ladstatt/apps/sudoku/android/SudokuCapturer.scala
@@ -4,8 +4,8 @@ import _root_.android.app.Activity
 import _root_.android.os.{Bundle, Handler, Process}
 import _root_.android.util.Log
 import _root_.android.view.View.OnClickListener
-import _root_.android.view.{Gravity, View, WindowManager}
-import _root_.android.widget.{Button, FrameLayout}
+import _root_.android.view.{Gravity, View, ViewGroup}
+import _root_.android.widget.{Button, FrameLayout, TextView}
 import com.google.android.gms.ads.{AdRequest, AdSize, AdView, MobileAds}
 import net.ladstatt.sudoku._
 import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener2
@@ -56,9 +56,13 @@ class SudokuCapturer extends Activity with CvCameraViewListener2 with CanLog {
   var frameNr: Int = 0
   var solution: Mat = _
   var calculationInProgress = false
+
   val defaultLibrary: DigitLibrary = Map().withDefaultValue((Double.MaxValue, None))
   val defaultHitCounts: HitCounters = Map().withDefaultValue(Map[Int, Int]().withDefaultValue(0))
   val AdUnitId: String = "ca-app-pub-1727389366588084/4496274256"
+  var adView: AdView = _
+  var showHint: Boolean = true
+  var hint: TextView = _
 
   var currState: SudokuState = AndroidOpenCV.DefaultAndroidState
 
@@ -68,60 +72,73 @@ class SudokuCapturer extends Activity with CvCameraViewListener2 with CanLog {
     TemplateLibrary.templateResource = "templates.csv"
   }
 
+  def execOnUIThread(f: => Unit): Unit = {
+    handler.post(new Runnable {
+      override def run(): Unit = f
+    })
+    ()
+  }
+
   /** Called when the activity is first created. */
   override def onCreate(savedInstanceState: Bundle) {
     super.onCreate(savedInstanceState)
 
     initAssets()
 
-    Log.i(TAG, "called onCreate")
-    getWindow.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-    setContentView(R.layout.sudoku)
+    //getWindow.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+
+    setContentView(R.layout.sudoku_frame_layout)
 
     MobileAds.initialize(this, AdUnitId)
-   //  val adView = findViewById(R.id.ad_view).asInstanceOf[AdView]
+
+
+
+    // adView = findViewById(R.id.ad_view).asInstanceOf[AdView]
 
     cameraView = findViewById(R.id.sudoku).asInstanceOf[CameraBridgeViewBase]
     cameraView.setCvCameraViewListener(this)
     rescanButton = findViewById(R.id.button_rescan).asInstanceOf[Button]
+    hint = findViewById(R.id.use_in_landscape).asInstanceOf[TextView]
+
+    adView = new AdView(this)
 
     rescanButton.setOnClickListener(new OnClickListener {
       override def onClick(v: View): Unit = {
         //  rescanButton.setVisibility(View.GONE)
         currState = AndroidOpenCV.DefaultAndroidState
         rescanButton.setVisibility(View.GONE)
-        //  adView.setVisibility(View.GONE)
+        adView.setVisibility(View.GONE)
         solution = null
 
       }
     })
 
-    val adView: AdView = new AdView(this)
+
     adView.setAdSize(AdSize.SMART_BANNER)
     adView.setAdUnitId(AdUnitId)
     adView.setVisibility(View.VISIBLE)
 
-    adView.setForegroundGravity(Gravity.CENTER_HORIZONTAL | Gravity.TOP)
-    // adView = new AdView(this, AdSize.BANNER, AdUnitId)
-    // adView.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.TOP)
-    // adView.setVisibility(View.VISIBLE)
+    import FrameLayout.LayoutParams
 
-    findViewById(R.id.mainLayout).asInstanceOf[FrameLayout].addView(adView)
+    val p = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP)
 
     val adRequestBuilder = new AdRequest.Builder()
-    adRequestBuilder.addTestDevice(AdRequest.DEVICE_ID_EMULATOR)
+    //asdRequestBuilder.addTestDevice(AdRequest.DEVICE_ID_EMULATOR)
+    // val adUnitTestId: String = "E7CB8BBA8EEEF5723B49B413253C551B"
+    //adRequestBuilder.addTestDevice(adUnitTestId)
     val r = adRequestBuilder.build()
-
     adView.loadAd(r)
 
     handler = new Handler()
     rescanButton.setVisibility(View.GONE)
     cameraView.enableView()
+
+    findViewById(R.id.mainLayout).asInstanceOf[FrameLayout].addView(adView, 2, p)
+
   }
 
   override def onBackPressed(): Unit = {
     super.onBackPressed()
-    //logInfo("backButton pressed")
   }
 
   override def onStop(): Unit = {
@@ -131,54 +148,29 @@ class SudokuCapturer extends Activity with CvCameraViewListener2 with CanLog {
 
   override def onPause(): Unit = {
     super.onPause()
-    //logInfo("onPause called")
     if (cameraView != null) cameraView.disableView()
+    if (adView != null) adView.pause()
+
   }
 
   override def onResume(): Unit = {
     super.onResume()
-    // logInfo("onResume called")
     AndroidOpenCV.init()
+    if (adView != null) adView.resume()
     //OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_6, this, mLoaderCallback)
     ()
   }
 
   override def onDestroy(): Unit = {
     super.onDestroy()
-    //logInfo("onDestroy called")
     if (cameraView != null) cameraView.disableView()
+    if (adView != null) adView.destroy()
   }
 
-
-  def detectSudoku(inputFrame: CameraBridgeViewBase.CvCameraViewFrame): SudokuResult = {
-    val frame = inputFrame.rgba()
-    frameNr = frameNr + 1
-
-    val pipeline: FramePipeline = FramePipeline(frame, SParams())
-
-    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)
-        currState = nextState
-        sudokuResult
-    }
-  }
-
-  def execOnUIThread(f: => Unit): Unit = {
-    handler.post(new Runnable {
-      override def run(): Unit = f
-    })
-    ()
-  }
-
-  def onCameraViewStarted(width: Int, height: Int) {
-    //logInfo(s"onCameraViewStarted (width: $width, height: $height)")
+  def onCameraViewStarted(width: Int, height: Int): Unit = {
   }
 
   def onCameraViewStopped() {
-    // logInfo("onCameraViewStopped called")
   }
 
   def onCameraFrame(inputFrame: CameraBridgeViewBase.CvCameraViewFrame): Mat = {
@@ -187,21 +179,27 @@ class SudokuCapturer extends Activity with CvCameraViewListener2 with CanLog {
     } else {
       if (!calculationInProgress) {
         calculationInProgress = true
+        execOnUIThread {
+          if (showHint) {
+            hint.setVisibility(View.GONE)
+            adView.setVisibility(View.VISIBLE)
+            adView.bringToFront()
+          }
+        }
         logInfo("starting to find sudoku ...")
         val result: Mat =
           detectSudoku(inputFrame) match {
             case s: SSuccess if s.someSolution.isDefined => {
               execOnUIThread({
                 rescanButton.setVisibility(View.VISIBLE)
-                // adView.setVisibility(View.VISIBLE)
               })
               solution = s.someSolution.get.solutionMat
               solution
             }
             case s: SSuccess if s.someSolution.isEmpty => {
-              s.inputFrame.pipeline.inverted
+              s.inputFrame.pipeline.frame
             }
-            case e: SFailure => e.inputFrame.pipeline.blurred
+            case e: SFailure => e.inputFrame.pipeline.grayed
           }
         calculationInProgress = false
         result
@@ -212,4 +210,20 @@ class SudokuCapturer extends Activity with CvCameraViewListener2 with CanLog {
     }
   }
 
+  def detectSudoku(inputFrame: CameraBridgeViewBase.CvCameraViewFrame): SudokuResult = {
+    val frame = inputFrame.rgba()
+    frameNr = frameNr + 1
+
+    val pipeline: FramePipeline = FramePipeline(frame, SParams())
+
+    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)
+        currState = nextState
+        sudokuResult
+    }
+  }
+
 }