Advance version number to 1.32.1

As an alternative way to get rid of the ROI.

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 1.32.1
+* Alternatively remove region of interest by dragging handle to a screen corner
+* Restrict region of interest to screen space
+* Remove extra action item to create barcode
+
 ## 1.32.0
 * Add bulk mode
 * Remember region of interest permanently

app/build.gradle

@@ -9,8 +9,8 @@ android {
 		minSdkVersion 9
 		targetSdkVersion sdk_version
 
-		versionCode 69
-		versionName '1.32.0'
+		versionCode 70
+		versionName '1.32.1'
 
 		// it's recommended to set this value to the lowest API level
 		// able to provide all the functionality

app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt

@@ -590,14 +590,19 @@ class CameraActivity : AppCompatActivity() {
 		) {
 			null
 		} else {
-			// map ROI in detectorView to cameraView because cameraView may
-			// be larger than the detectorView
+			// map ROI in detectorView to cameraView
 			val previewRect = cameraView.previewRect
+			// previewRect may be larger than the screen (and thus as the
+			// detectorView) in which case its left and/or top coordinate
+			// will be negative which must then be clamped to the
+			// screen/DetectorView
+			val previewLeft = max(0, previewRect.left)
+			val previewTop = max(0, previewRect.top)
 			val previewRoi = Rect(
-				previewRect.left + viewRoi.left,
-				previewRect.top + viewRoi.top,
-				previewRect.left + viewRoi.right,
-				previewRect.top + viewRoi.bottom
+				previewLeft + viewRoi.left,
+				previewTop + viewRoi.top,
+				previewLeft + viewRoi.right,
+				previewTop + viewRoi.bottom
 			)
 			val previewRectWidth = previewRect.width().toFloat()
 			val previewRectHeight = previewRect.height().toFloat()

app/src/main/kotlin/de/markusfisch/android/binaryeye/app/SystemBars.kt

@@ -7,6 +7,7 @@ import android.os.Build
 import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
 import android.view.View
+import android.view.WindowManager
 import android.widget.AbsListView
 import de.markusfisch.android.binaryeye.R
 
@@ -50,7 +51,12 @@ private fun lastChildOutOfView(listView: AbsListView): Boolean {
 
 fun initSystemBars(activity: AppCompatActivity) {
 	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-		activity.window.decorView.systemUiVisibility =
+		// keeps the soft keyboard from repositioning the layout
+		val window = activity.window
+		window.setSoftInputMode(
+			WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+		)
+		window.decorView.systemUiVisibility =
 			View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
 					View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
 					View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/EncodeFragment.kt

@@ -31,11 +31,6 @@ class EncodeFragment : Fragment() {
 		BarcodeFormat.UPC_A
 	)
 
-	override fun onCreate(state: Bundle?) {
-		super.onCreate(state)
-		setHasOptionsMenu(true)
-	}
-
 	override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -94,20 +89,6 @@ class EncodeFragment : Fragment() {
 		prefs.indexOfLastSelectedFormat = formatView.selectedItemPosition
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		inflater.inflate(R.menu.fragment_encode, menu)
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		return when (item.itemId) {
-			R.id.next -> {
-				encode()
-				true
-			}
-			else -> super.onOptionsItemSelected(item)
-		}
-	}
-
 	private fun encode() {
 		val format = writers[formatView.selectedItemPosition]
 		val size = getSize(sizeBarView.progress)

app/src/main/kotlin/de/markusfisch/android/binaryeye/rs/Preprocessor.kt

@@ -147,7 +147,7 @@ class Preprocessor(
 					0, 0,
 					roi.width(), roi.height(),
 					yuvAlloc,
-					roi.left, roi.top
+					max(0, roi.left), max(0, roi.top)
 				)
 				roiAlloc
 			} else {

app/src/main/kotlin/de/markusfisch/android/binaryeye/widget/DetectorView.kt

@@ -185,8 +185,18 @@ class DetectorView : View {
 	}
 
 	private fun snap(x: Int, y: Int) {
-		if (abs(x - center.x) < distToFull ||
-			abs(y - center.y) < distToFull
+		val cx = clampX(x)
+		val cy = clampY(y)
+		val dx = abs(cx - center.x)
+		val dy = abs(cy - center.y)
+		// check if handle is close to the vertical or horizontal center line
+		if (dx < distToFull ||
+			dy < distToFull ||
+			// check if handle is close to a screen corner
+			(
+				(abs(cy - minY) < distToFull || abs(maxY - cy) < distToFull) &&
+				abs(dx - center.x) < distToFull
+			)
 		) {
 			reset()
 			invalidate()
@@ -284,10 +294,14 @@ class DetectorView : View {
 	}
 
 	private fun clampHandlePos() {
-		handlePos.x = min(center.x * 2, max(0, handlePos.x))
-		handlePos.y = min(maxY, max(minY, handlePos.y))
+		handlePos.x = clampX(handlePos.x)
+		handlePos.y = clampY(handlePos.y)
 	}
 
+	private fun clampX(x: Int) = min(center.x * 2, max(0, x))
+
+	private fun clampY(y: Int) = min(maxY, max(minY, y))
+
 	internal class SavedState : BaseSavedState {
 		val savedHandlePos = Point()
 

app/src/main/res/menu/fragment_encode.xml

@@ -1,9 +0,0 @@
-<menu
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:material="http://schemas.android.com/apk/res-auto">
-	<item
-		android:id="@+id/next"
-		android:title="@string/encode"
-		android:icon="@drawable/ic_action_next"
-		material:showAsAction="ifRoom"/>
-</menu>

fastlane/metadata/android/en-US/changelogs/69.txt

@@ -0,0 +1,7 @@
+* Add bulk mode
+* Remember region of interest permanently
+* Export generated barcode as SVG
+* Run detection on images in background
+* Remove a scan from result view
+* Update Indonesian translation
+

gradlew

@@ -1,5 +1,9 @@
 #!/usr/bin/env sh
 
+# ensure this app builds *without* the NDK because using the NDK will
+# produce broken for Android 6
+export ANDROID_NDK_HOME=
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X