Advance version number to 1.13.1

* Fix crash caused by missing `\R` support for Regex
* Replaced `\R` usage in VType actions with official equivalent
* Replace `\R`, which was overlooked

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+# 1.13.1
+* Fix crash caused by missing support for Regex on Android < 6
+
+# 1.13.0
+* Add missing extras for ZXing result intents
+
 # 1.12.0
 * Add preferences dialog and the option to use a custom URL with read contents
 * Add Brazilian Portuguese translation

README.md

@@ -9,11 +9,25 @@ Unlike many others, it works in portrait and landscape orientation, can read
 inverted codes, comes in Material Design and doesn't do much else but decoding
 a barcode.
 
-<a href="https://f-droid.org/en/packages/de.markusfisch.android.binaryeye/"><img alt="Get it on F-Droid" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="80"/></a> <a href="https://play.google.com/store/apps/details?id=de.markusfisch.android.binaryeye"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="80"/></a>
-
 And it's written in [Kotlin][kotlin] because I wanted to explore that a
 bit more.
 
+## Screenshots
+
+<img
+	src="https://raw.githubusercontent.com/markusfisch/BinaryEye/gh-pages/screencap-scanning.png"
+	alt="Screenshot Scanning" width="160"/>
+<img
+	src="https://raw.githubusercontent.com/markusfisch/BinaryEye/gh-pages/screencap-decoded.png"
+	alt="Screenshot Result" width="160"/>
+<img
+	src="https://raw.githubusercontent.com/markusfisch/BinaryEye/gh-pages/screencap-compose-barcode.png"
+	alt="Screenshot Compose Barcode" width="160"/>
+
+## Download
+
+<a href="https://f-droid.org/en/packages/de.markusfisch.android.binaryeye/"><img alt="Get it on F-Droid" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="80"/></a> <a href="https://play.google.com/store/apps/details?id=de.markusfisch.android.binaryeye"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="80"/></a>
+
 [play]: https://play.google.com/store/search?q=barcode%20scanner&c=apps
 [zxing]: https://github.com/zxing/zxing
 [kotlin]: http://kotlinlang.org/

app/build.gradle

@@ -9,8 +9,8 @@ android {
 		minSdkVersion 9
 		targetSdkVersion sdk_version
 
-		versionCode 36
-		versionName '1.12.0'
+		versionCode 38
+		versionName '1.13.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/actions/IAction.kt

@@ -1,10 +1,9 @@
 package de.markusfisch.android.binaryeye.actions
 
-import de.markusfisch.android.binaryeye.app.execShareIntent
-
 import android.content.Context
 import android.content.Intent
 import android.widget.Toast
+import de.markusfisch.android.binaryeye.app.execShareIntent
 
 interface IAction {
 	val iconResId: Int

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/mail/MailAction.kt

@@ -1,11 +1,10 @@
 package de.markusfisch.android.binaryeye.actions.mail
 
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.actions.SimpleIntentIAction
-
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.actions.SimpleIntentIAction
 
 object MailAction : SimpleIntentIAction() {
 	private val mailRegex =

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/sms/SmsAction.kt

@@ -1,14 +1,14 @@
 package de.markusfisch.android.binaryeye.actions.sms
 
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.actions.SimpleIntentIAction
-
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.actions.SimpleIntentIAction
 
 object SmsAction : SimpleIntentIAction() {
-	private val smsRegex = """^sms(?:to)?:(\+?[0-9]+)(?::([\S\s]*))?$""".toRegex(RegexOption.IGNORE_CASE)
+	private val smsRegex =
+		"""^sms(?:to)?:(\+?[0-9]+)(?::([\S\s]*))?$""".toRegex(RegexOption.IGNORE_CASE)
 
 	override val iconResId: Int = R.drawable.ic_action_sms
 	override val titleResId: Int = R.string.sms_send

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/tel/TelAction.kt

@@ -1,11 +1,10 @@
 package de.markusfisch.android.binaryeye.actions.tel
 
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.actions.SimpleIntentIAction
-
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.actions.SimpleIntentIAction
 
 object TelAction : SimpleIntentIAction() {
 	private val telRegex = """^tel:(\+?[0-9]+)$""".toRegex(RegexOption.IGNORE_CASE)

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/vtype/VType.kt

@@ -1,11 +1,13 @@
 package de.markusfisch.android.binaryeye.actions.vtype
 
 object VTypeParser {
+	private const val BACKSLASH_R_LEGACY = "(?:\u000D\u000A|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029])"
 	private val vTypeRegex =
-		"""^BEGIN:(VCARD|VEVENT)(?:\R.+?:[\s\S]+?)+?\REND:\1\R?$""".toRegex(RegexOption.IGNORE_CASE)
+		"""^BEGIN:(VCARD|VEVENT)(?:$BACKSLASH_R_LEGACY.+?:[\s\S]+?)+?${BACKSLASH_R_LEGACY}END:\1$BACKSLASH_R_LEGACY?$""".toRegex(RegexOption.IGNORE_CASE)
 	private val propertyRegex = """^(.+?):([\s\S]*?)$""".toRegex(RegexOption.MULTILINE)
 
-	fun parseVType(data: String): String? = vTypeRegex.matchEntire(data)?.groupValues?.get(1)?.toUpperCase()
+	fun parseVType(data: String): String? =
+		vTypeRegex.matchEntire(data)?.groupValues?.get(1)?.toUpperCase()
 
 	fun parseMap(data: String): Map<String, List<VTypeProperty>> = propertyRegex.findAll(data).map {
 		it.groupValues[1].split(';').let { typeAndInfo ->

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/vtype/vcard/VCardAction.kt

@@ -1,14 +1,13 @@
 package de.markusfisch.android.binaryeye.actions.vtype.vcard
 
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.actions.SimpleIntentIAction
-import de.markusfisch.android.binaryeye.actions.vtype.VTypeParser
-
 import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.provider.ContactsContract
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.actions.SimpleIntentIAction
+import de.markusfisch.android.binaryeye.actions.vtype.VTypeParser
 
 object VCardAction : SimpleIntentIAction() {
 	override val iconResId: Int
@@ -116,14 +115,23 @@ object VCardAction : SimpleIntentIAction() {
 	}
 
 	private val String.locationFormat: String
-		get() = """^([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?)$""".toRegex().matchEntire(this)?.groupValues?.let {
-			listOf(it[1], it[2], it[3], "${it[4]} ${it[6]}", "${it[5]} ${it[7]}").filter { line -> line.isNotBlank() }
+		get() = """^([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?)$""".toRegex().matchEntire(
+			this
+		)?.groupValues?.let {
+			listOf(
+				it[1],
+				it[2],
+				it[3],
+				"${it[4]} ${it[6]}",
+				"${it[5]} ${it[7]}"
+			).filter { line -> line.isNotBlank() }
 				.joinToString("\n").takeIf { location -> location.isNotBlank() }
 		} ?: this
 
 	private val String.nameFormat: String
 		get() = """^([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?)$""".toRegex().matchEntire(this)?.groupValues?.let {
-			listOf(it[4], it[2], it[3], it[1], it[5]).joinToString(" ").takeIf { name -> name.isNotBlank() }
+			listOf(it[4], it[2], it[3], it[1], it[5]).joinToString(" ")
+				.takeIf { name -> name.isNotBlank() }
 		} ?: this
 
 	private val String.mailType: Int?

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/vtype/vevent/VEventAction.kt

@@ -1,18 +1,16 @@
 package de.markusfisch.android.binaryeye.actions.vtype.vevent
 
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.actions.SimpleIntentIAction
-import de.markusfisch.android.binaryeye.actions.vtype.VTypeParser
-
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.provider.CalendarContract
 import android.support.annotation.RequiresApi
-
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.actions.SimpleIntentIAction
+import de.markusfisch.android.binaryeye.actions.vtype.VTypeParser
 import java.text.SimpleDateFormat
-import java.util.Date
+import java.util.*
 
 object VEventAction : SimpleIntentIAction() {
 	override val iconResId: Int

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/wifi/WifiAction.kt

@@ -1,19 +1,13 @@
 package de.markusfisch.android.binaryeye.actions.wifi
 
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.actions.IAction
-
 import android.content.Context
 import android.content.Context.WIFI_SERVICE
 import android.net.wifi.WifiConfiguration
 import android.net.wifi.WifiManager
 import android.widget.Toast
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.actions.IAction
+import kotlinx.coroutines.*
 
 object WifiAction : IAction {
 	override val iconResId = R.drawable.ic_action_wifi

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/wifi/WifiConfigurationFactory.kt

@@ -194,8 +194,10 @@ object WifiConfigurationFactory {
 					enterpriseConfig.identity = data.identity
 					enterpriseConfig.anonymousIdentity = data.anonymousIdentity
 					enterpriseConfig.password = data.password
-					enterpriseConfig.eapMethod = data.eapMethod ?: return null // non valid eapMethod
-					enterpriseConfig.phase2Method = data.phase2Method ?: return null // non valid phase2Method
+					enterpriseConfig.eapMethod =
+						data.eapMethod ?: return null // non valid eapMethod
+					enterpriseConfig.phase2Method =
+						data.phase2Method ?: return null // non valid phase2Method
 				} ?: return null // api isn't high enough
 			}
 			return this

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

@@ -1,18 +1,5 @@
 package de.markusfisch.android.binaryeye.activity
 
-import com.google.zxing.Result
-import com.google.zxing.ResultMetadataType
-
-import de.markusfisch.android.cameraview.widget.CameraView
-
-import de.markusfisch.android.binaryeye.app.db
-import de.markusfisch.android.binaryeye.app.hasCameraPermission
-import de.markusfisch.android.binaryeye.app.initSystemBars
-import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.rs.Preprocessor
-import de.markusfisch.android.binaryeye.zxing.Zxing
-import de.markusfisch.android.binaryeye.R
-
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -30,10 +17,18 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.SeekBar
 import android.widget.Toast
-
+import com.google.zxing.Result
+import com.google.zxing.ResultMetadataType
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.app.db
+import de.markusfisch.android.binaryeye.app.hasCameraPermission
+import de.markusfisch.android.binaryeye.app.initSystemBars
+import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.rs.Preprocessor
+import de.markusfisch.android.binaryeye.zxing.Zxing
+import de.markusfisch.android.cameraview.widget.CameraView
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-
 import java.io.IOException
 
 class CameraActivity : AppCompatActivity() {
@@ -413,9 +408,7 @@ class CameraActivity : AppCompatActivity() {
 		}
 
 		if (returnResult) {
-			val resultIntent = Intent()
-			resultIntent.putExtra("SCAN_RESULT", result.text)
-			setResult(RESULT_OK, resultIntent)
+			setResult(RESULT_OK, getReturnIntent(result))
 			finish()
 			return
 		}
@@ -470,3 +463,49 @@ fun getRawBytes(result: Result): ByteArray? {
 	// Zxing cuts off content prefixes like "WIFI:"
 	return if (bytes.size >= result.text.length) bytes else null
 }
+
+fun getReturnIntent(result: Result): Intent {
+	val intent = Intent()
+	intent.putExtra("SCAN_RESULT", result.text)
+	intent.putExtra(
+		"SCAN_RESULT_FORMAT",
+		result.barcodeFormat.toString()
+	)
+	if (result.rawBytes?.isNotEmpty() == true) {
+		intent.putExtra("SCAN_RESULT_BYTES", result.rawBytes)
+	}
+	val metadata = result.resultMetadata
+	metadata?.let {
+		val orientation = metadata[ResultMetadataType.UPC_EAN_EXTENSION]
+		orientation?.let {
+			intent.putExtra(
+				"SCAN_RESULT_ORIENTATION",
+				orientation.toString()
+			)
+		}
+		val ecLevel = metadata[ResultMetadataType.ERROR_CORRECTION_LEVEL]
+		ecLevel?.let {
+			intent.putExtra(
+				"SCAN_RESULT_ERROR_CORRECTION_LEVEL",
+				ecLevel.toString()
+			)
+		}
+		val upcEanExtension = metadata[ResultMetadataType.UPC_EAN_EXTENSION]
+		upcEanExtension?.let {
+			intent.putExtra(
+				"SCAN_RESULT_UPC_EAN_EXTENSION",
+				upcEanExtension.toString()
+			)
+		}
+		val segments = metadata[ResultMetadataType.BYTE_SEGMENTS]
+		segments?.let {
+			var i = 0
+			@Suppress("UNCHECKED_CAST")
+			for (seg in segments as Iterable<ByteArray>) {
+				intent.putExtra("SCAN_RESULT_BYTE_SEGMENTS_$i", seg)
+				++i
+			}
+		}
+	}
+	return intent
+}

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

@@ -1,21 +1,19 @@
 package de.markusfisch.android.binaryeye.activity
 
-import com.google.zxing.BarcodeFormat
-
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.app.initSystemBars
-import de.markusfisch.android.binaryeye.app.setFragment
-import de.markusfisch.android.binaryeye.fragment.DecodeFragment
-import de.markusfisch.android.binaryeye.fragment.EncodeFragment
-import de.markusfisch.android.binaryeye.fragment.HistoryFragment
-import de.markusfisch.android.binaryeye.fragment.PreferencesFragment
-
 import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar
+import com.google.zxing.BarcodeFormat
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.app.initSystemBars
+import de.markusfisch.android.binaryeye.app.setFragment
+import de.markusfisch.android.binaryeye.fragment.DecodeFragment
+import de.markusfisch.android.binaryeye.fragment.EncodeFragment
+import de.markusfisch.android.binaryeye.fragment.HistoryFragment
+import de.markusfisch.android.binaryeye.fragment.PreferencesFragment
 
 class MainActivity : AppCompatActivity() {
 	override fun onSupportNavigateUp(): Boolean {
@@ -89,9 +87,10 @@ class MainActivity : AppCompatActivity() {
 			val intent = Intent(context, MainActivity::class.java)
 			intent.putExtra(ENCODE, text)
 			if (isExternal) {
-				val flagActivityClearTask = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-					Intent.FLAG_ACTIVITY_CLEAR_TASK
-				} else 0
+				val flagActivityClearTask =
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+						Intent.FLAG_ACTIVITY_CLEAR_TASK
+					} else 0
 				intent.addFlags(
 					Intent.FLAG_ACTIVITY_NO_HISTORY or
 							flagActivityClearTask or

app/src/main/kotlin/de/markusfisch/android/binaryeye/adapter/ScansAdapter.kt

@@ -1,8 +1,5 @@
 package de.markusfisch.android.binaryeye.adapter
 
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.data.Database
-
 import android.content.Context
 import android.database.Cursor
 import android.view.LayoutInflater
@@ -10,6 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.CursorAdapter
 import android.widget.TextView
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.data.Database
 
 class ScansAdapter(context: Context, cursor: Cursor) :
 	CursorAdapter(context, cursor, false) {

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

@@ -1,10 +1,9 @@
 package de.markusfisch.android.binaryeye.app
 
-import de.markusfisch.android.binaryeye.data.Database
-import de.markusfisch.android.binaryeye.preference.Preferences
-
 import android.app.Application
 import android.support.v8.renderscript.RenderScript
+import de.markusfisch.android.binaryeye.data.Database
+import de.markusfisch.android.binaryeye.preference.Preferences
 
 val db = Database()
 val prefs = Preferences()

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

@@ -1,11 +1,10 @@
 package de.markusfisch.android.binaryeye.app
 
-import de.markusfisch.android.binaryeye.R
-
 import android.annotation.SuppressLint
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentTransaction
+import de.markusfisch.android.binaryeye.R
 
 fun setFragment(fm: FragmentManager?, fragment: Fragment) {
 	fm?.let { getTransaction(fm, fragment).commit() }

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

@@ -1,10 +1,10 @@
 package de.markusfisch.android.binaryeye.app
 
+import android.Manifest
 import android.app.Activity
 import android.content.pm.PackageManager
 import android.support.v4.app.ActivityCompat
 import android.support.v4.content.ContextCompat
-import android.Manifest
 
 fun hasCameraPermission(activity: Activity, requestCode: Int): Boolean {
 	return hasPermission(activity, Manifest.permission.CAMERA, requestCode)

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

@@ -1,15 +1,13 @@
 package de.markusfisch.android.binaryeye.app
 
-import de.markusfisch.android.binaryeye.BuildConfig
-import de.markusfisch.android.binaryeye.R
-
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.support.v4.content.FileProvider
 import android.widget.Toast
-
+import de.markusfisch.android.binaryeye.BuildConfig
+import de.markusfisch.android.binaryeye.R
 import java.io.File
 
 fun shareText(context: Context, text: String, type: String = "text/plain") {

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

@@ -1,13 +1,12 @@
 package de.markusfisch.android.binaryeye.app
 
-import de.markusfisch.android.binaryeye.R
-
 import android.os.Build
 import android.support.v4.content.ContextCompat
 import android.support.v4.view.ViewCompat
 import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.view.Window
+import de.markusfisch.android.binaryeye.R
 
 fun initSystemBars(activity: AppCompatActivity?) {
 	val view = activity?.findViewById(R.id.main_layout) ?: return
@@ -40,7 +39,7 @@ fun setSystemBarColor(window: Window, color: Int): Boolean {
 	window.navigationBarColor = color
 	window.decorView.systemUiVisibility =
 		View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-		View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
-		View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+				View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
+				View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
 	return true
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/data/Database.kt

@@ -1,13 +1,12 @@
 package de.markusfisch.android.binaryeye.data
 
-import de.markusfisch.android.binaryeye.app.hasNonPrintableCharacters
-
 import android.content.ContentValues
 import android.content.Context
 import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
 import android.text.format.DateFormat
+import de.markusfisch.android.binaryeye.app.hasNonPrintableCharacters
 
 class Database {
 	private lateinit var db: SQLiteDatabase

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

@@ -1,27 +1,23 @@
 package de.markusfisch.android.binaryeye.fragment
 
-import com.google.zxing.BarcodeFormat
-
-import de.markusfisch.android.binaryeye.app.shareFile
-import de.markusfisch.android.binaryeye.zxing.Zxing
-import de.markusfisch.android.binaryeye.R
-
-import android.os.Bundle
 import android.graphics.Bitmap
+import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.Toast
-
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-
+import com.google.zxing.BarcodeFormat
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.app.shareFile
+import de.markusfisch.android.binaryeye.zxing.Zxing
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
 
 class BarcodeFragment : Fragment() {
 	override fun onCreateView(

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

@@ -1,17 +1,6 @@
 package de.markusfisch.android.binaryeye.fragment
 
 import android.annotation.SuppressLint
-import com.google.zxing.BarcodeFormat
-
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.actions.IAction
-import de.markusfisch.android.binaryeye.actions.validateOrGetNew
-import de.markusfisch.android.binaryeye.app.addFragment
-import de.markusfisch.android.binaryeye.app.hasNonPrintableCharacters
-import de.markusfisch.android.binaryeye.app.hasWritePermission
-import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.app.shareText
-
 import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
@@ -23,17 +12,16 @@ import android.support.v4.app.Fragment
 import android.text.ClipboardManager
 import android.text.Editable
 import android.text.TextWatcher
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import android.widget.EditText
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
-
+import com.google.zxing.BarcodeFormat
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.actions.IAction
+import de.markusfisch.android.binaryeye.actions.validateOrGetNew
+import de.markusfisch.android.binaryeye.app.*
 import java.io.File
 import java.io.IOException
 import java.net.URLEncoder

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

@@ -1,23 +1,16 @@
 package de.markusfisch.android.binaryeye.fragment
 
-import com.google.zxing.BarcodeFormat
-
-import de.markusfisch.android.binaryeye.app.addFragment
-import de.markusfisch.android.binaryeye.R
-
 import android.content.Context
 import android.os.Bundle
 import android.support.v4.app.Fragment
-import android.view.inputmethod.InputMethodManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.SeekBar
-import android.widget.Spinner
-import android.widget.TextView
-import android.widget.Toast
+import android.view.inputmethod.InputMethodManager
+import android.widget.*
+import com.google.zxing.BarcodeFormat
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.app.addFragment
 
 class EncodeFragment : Fragment() {
 	private lateinit var formatView: Spinner

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

@@ -1,28 +1,20 @@
 package de.markusfisch.android.binaryeye.fragment
 
-import com.google.zxing.BarcodeFormat
-
-import de.markusfisch.android.binaryeye.adapter.ScansAdapter
-import de.markusfisch.android.binaryeye.app.addFragment
-import de.markusfisch.android.binaryeye.app.db
-import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.app.shareText
-import de.markusfisch.android.binaryeye.data.Database
-import de.markusfisch.android.binaryeye.R
-
 import android.app.AlertDialog
 import android.content.Context
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.widget.SwitchCompat
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import android.widget.ListView
-
+import com.google.zxing.BarcodeFormat
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.adapter.ScansAdapter
+import de.markusfisch.android.binaryeye.app.addFragment
+import de.markusfisch.android.binaryeye.app.db
+import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.app.shareText
+import de.markusfisch.android.binaryeye.data.Database
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch

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

@@ -1,8 +1,5 @@
 package de.markusfisch.android.binaryeye.fragment
 
-import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.R
-
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.widget.SwitchCompat
@@ -10,6 +7,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.app.prefs
 
 class PreferencesFragment : Fragment() {
 	private lateinit var useHistorySwitch: SwitchCompat

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

@@ -1,13 +1,8 @@
 package de.markusfisch.android.binaryeye.rs
 
-import de.markusfisch.android.binaryeye.renderscript.ScriptC_rotator
-
 import android.content.Context
-import android.support.v8.renderscript.Allocation
-import android.support.v8.renderscript.Element
-import android.support.v8.renderscript.RenderScript
-import android.support.v8.renderscript.ScriptIntrinsicResize
-import android.support.v8.renderscript.Type
+import android.support.v8.renderscript.*
+import de.markusfisch.android.binaryeye.renderscript.ScriptC_rotator
 
 class Preprocessor(
 	context: Context,

app/src/main/kotlin/de/markusfisch/android/binaryeye/zxing/Zxing.kt

@@ -1,23 +1,9 @@
 package de.markusfisch.android.binaryeye.zxing
 
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.BinaryBitmap
-import com.google.zxing.DecodeHintType
-import com.google.zxing.EncodeHintType
-import com.google.zxing.LuminanceSource
-import com.google.zxing.MultiFormatReader
-import com.google.zxing.MultiFormatWriter
-import com.google.zxing.PlanarYUVLuminanceSource
-import com.google.zxing.RGBLuminanceSource
-import com.google.zxing.ReaderException
-import com.google.zxing.Result
-import com.google.zxing.common.HybridBinarizer
-
 import android.graphics.Bitmap
-
-import java.util.Arrays
-import java.util.EnumMap
-import java.util.EnumSet
+import com.google.zxing.*
+import com.google.zxing.common.HybridBinarizer
+import java.util.*
 
 class Zxing {
 	private val multiFormatReader: MultiFormatReader = MultiFormatReader()