Advance version number to 1.9.1

Instead of opening Google when searching for decoded content,
there's now a dialog to pick a suitable search engine from.

Especially useful if the user already knows what category
the scanned item belongs to.

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## 1.9.1
+* Pick search engine for content that is not an URL
+
 ## 1.9.0
 * Try Google when opening content as URL fails
 * Show generic error message if barcode generation fails

app/build.gradle

@@ -9,8 +9,8 @@ android {
 		minSdkVersion 9
 		targetSdkVersion sdk_version
 
-		versionCode 28
-		versionName '1.9.0'
+		versionCode 29
+		versionName '1.9.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/fragment/DecodeFragment.kt

@@ -169,7 +169,7 @@ class DecodeFragment : Fragment() {
 		).show()
 	}
 
-	private fun openUrl(url: String, googleIfNoUrl: Boolean = true) {
+	private fun openUrl(url: String, searchIfNoUrl: Boolean = true) {
 		if (activity == null || url.isEmpty()) {
 			return
 		}
@@ -180,14 +180,8 @@ class DecodeFragment : Fragment() {
 		val intent = Intent(Intent.ACTION_VIEW, uri)
 		if (intent.resolveActivity(activity.packageManager) != null) {
 			startActivity(intent)
-		} else if (googleIfNoUrl) {
-			openUrl(
-				"https://www.google.com/search?q=" + URLEncoder.encode(
-					url,
-					"utf-8"
-				),
-				false
-			)
+		} else if (searchIfNoUrl) {
+			pickSearchEngineAndSearch(activity, url)
 		} else {
 			Toast.makeText(
 				activity,
@@ -197,6 +191,21 @@ class DecodeFragment : Fragment() {
 		}
 	}
 
+	private fun pickSearchEngineAndSearch(context: Context, query: String) {
+		val urls = context.resources.getStringArray(
+			R.array.search_engines_values
+		)
+		AlertDialog.Builder(context)
+			.setTitle(R.string.pick_search_engine)
+			.setItems(R.array.search_engines_names) { _, which ->
+				openUrl(
+					urls[which] + URLEncoder.encode(query, "utf-8"),
+					false
+				)
+			}
+			.show()
+	}
+
 	private fun askForFileNameAndSave(raw: ByteArray) {
 		val ac = activity
 		ac ?: return

app/src/main/res/values-de/strings.xml

@@ -16,6 +16,7 @@
 	<string name="put_into_clipboard">In die Zwischenablage legen</string>
 	<string name="open_url">URL öffnen</string>
 	<string name="cannot_resolve_action">Keine App kann das öffnen</string>
+	<string name="pick_search_engine">Suchmaschine auswählen</string>
 	<string name="format">Format</string>
 	<string name="size">Größe in Pixeln</string>
 	<string name="width_by_height">%1$d×%2$d</string>

app/src/main/res/values-fr/strings.xml

@@ -16,6 +16,7 @@
 	<string name="put_into_clipboard">Mis dans le presse-papiers</string>
 	<string name="open_url">Ouvrir l\'url</string>
 	<string name="cannot_resolve_action">Aucune application ne peut ouvrir ça</string>
+	<string name="pick_search_engine">Pick a search engine</string>
 	<string name="format">Format</string>
 	<string name="size">Taille en pixels</string>
 	<string name="width_by_height">%1$d×%2$d</string>

app/src/main/res/values-hu/strings.xml

@@ -16,6 +16,7 @@
 	<string name="put_into_clipboard">Vágólapra helyezés</string>
 	<string name="open_url">URL megnyitása</string>
 	<string name="cannot_resolve_action">Nincs alkalmazás, amely meg tudná nyitni azt</string>
+	<string name="pick_search_engine">Pick a search engine</string>
 	<string name="format">Formátum</string>
 	<string name="size">Méret képpontban</string>
 	<string name="width_by_height">%1$d×%2$d</string>

app/src/main/res/values-it/strings.xml

@@ -16,6 +16,7 @@
 	<string name="put_into_clipboard">Metti negli appunti</string>
 	<string name="open_url">Apri URL</string>
 	<string name="cannot_resolve_action">Nessuna app può aprirlo</string>
+	<string name="pick_search_engine">Pick a search engine</string>
 	<string name="format">Formato</string>
 	<string name="size">Dimensioni in pixel</string>
 	<string name="width_by_height">%1$d×%2$d</string>

app/src/main/res/values-nl/strings.xml

@@ -16,6 +16,7 @@
 	<string name="put_into_clipboard">Kopieer de inhoud naar het klembord</string>
 	<string name="open_url">URL openen</string>
 	<string name="cannot_resolve_action">Er is geen app aangetroffen die dit kan openen</string>
+	<string name="pick_search_engine">Pick a search engine</string>
 	<string name="format">Formaat</string>
 	<string name="size">Grootte, in pixels</string>
 	<string name="width_by_height">%1$d×%2$d</string>

app/src/main/res/values/search_engines.xml

@@ -0,0 +1,18 @@
+<resources>
+	<string-array name="search_engines_names">
+		<item>Google</item>
+		<item>DuckDuckGo</item>
+		<item>Qwant</item>
+		<item>OpenFoodFacts.org</item>
+		<item>OpenBeautyFacts.org</item>
+		<item>OpenPetFoodFacts.org</item>
+	</string-array>
+	<string-array name="search_engines_values">
+		<item>https://www.google.com/search?q=</item>
+		<item>https://duckduckgo.com/?q=</item>
+		<item>https://www.qwant.com/?q=</item>
+		<item>https://world.openfoodfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://world.openbeautyfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://world.openpetfoodfacts.org/cgi/search.pl?search_terms=</item>
+	</string-array>
+</resources>

app/src/main/res/values/strings.xml

@@ -16,6 +16,7 @@
 	<string name="put_into_clipboard">Put into clipboard</string>
 	<string name="open_url">Open url</string>
 	<string name="cannot_resolve_action">No application can open that</string>
+	<string name="pick_search_engine">Pick a search engine</string>
 	<string name="format">Format</string>
 	<string name="size">Size in pixels</string>
 	<string name="width_by_height">%1$d×%2$d</string>