Bimba.git

diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/journey/JourneyFragment.kt b/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/journey/JourneyFragment.kt
index e7050ea7f9e6a8314d43af88ca623477e008a796..7a37f67c483df9e94995581c8268ce11782c26dc 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/journey/JourneyFragment.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/journey/JourneyFragment.kt
@@ -418,7 +418,9 @@ 		viewModel.searchRequester = source
 		activityLauncher.launch(
 			ResultsActivity.getIntent(
 				requireContext(),
-				Query(getSearchText(source))
+				Query(getSearchText(source)),
+				true,
+				"transitous"
 			)
 		)
 	}




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt
index 9b8b1da3afd0b34a1f9fb2d2812be70543d2c998..614947b9caab0f1785cb11f3e48363708c05156a 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt
@@ -54,7 +54,8 @@ 	): Line?
 
 	suspend fun queryQueryables(
 		query: String,
-		context: Context
+		context: Context,
+		feedID: String? = null
 	): List<Queryable>?
 
 	suspend fun locateQueryables(




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/OfflineRepository.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OfflineRepository.kt
index 07850536570dac297712700dc046d3805f2912c7..2906b7096f0283669d3c38ab9c82ae4e94e96838 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/repo/OfflineRepository.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OfflineRepository.kt
@@ -226,7 +226,8 @@ 	}
 
 	override suspend fun queryQueryables(
 		query: String,
-		context: Context
+		context: Context,
+		feedID: String?
 	): List<Queryable>? {
 		TODO("Not yet implemented")
 	}




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt
index 3f078daac0a5c69f2679a0e00142d3172234aae9..fa1dcca8a770916ab39206fa0dbf10fff6ab0995 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt
@@ -274,14 +274,14 @@ 		}
 	}
 
 	override suspend fun queryQueryables(
-		query: String, context: Context
+		query: String, context: Context, feedID: String?
 	): List<Queryable>? {
-		val transitousQueryables = if (Server.get(context).feeds.transitousEnabled()) {
+		val transitousQueryables = if (Server.get(context).feeds.transitousEnabled() || feedID == "transitous") {
 			getTransitousQueryables(query, context)
 		} else {
 			null
 		}
-		val bimbaQueryables = if (Server.get(context).feeds.bimbaEnabled()) {
+		val bimbaQueryables = if (Server.get(context).feeds.bimbaEnabled() && feedID == null) {  // TODO select bimba feed
 			getQueryables(query, null, context, "query")
 		} else {
 			null




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/search/ResultsActivity.kt b/app/src/main/java/xyz/apiote/bimba/czwek/search/ResultsActivity.kt
index 5332c8d63e9a152ef1b83a4c2b5fd61d35407ea3..e6fb31af640bbf1aabfe3ddf0d9095cd5551b3e3 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/search/ResultsActivity.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/search/ResultsActivity.kt
@@ -51,12 +51,17 @@ class ResultsActivity : AppCompatActivity(), LocationListener, SensorEventListener {
 	companion object {
 		const val QUERY_KEY = "query"
 		const val RETURN_KEY = "ret"
+		const val FEED_KEY = "feed"
 		fun getIntent(
 			context: Context,
-			query: Query
+			query: Query,
+			ret: Boolean = false,
+			feedID: String? = null
 		) =
 			Intent(context, ResultsActivity::class.java).apply {
 				putExtra(QUERY_KEY, query)
+				putExtra(RETURN_KEY, ret)
+				putExtra(FEED_KEY, feedID)
 			}
 	}
 
@@ -246,7 +251,7 @@ 	private fun getQueryablesByQuery(query: String, context: Context) {
 		MainScope().launch {
 			try {
 				val repository = OnlineRepository()
-				val result = repository.queryQueryables(query, context)
+				val result = repository.queryQueryables(query, context, intent.getStringExtra(FEED_KEY))
 				getFeeds()
 				updateItems(result, null, false)
 			} catch (e: TrafficResponseException) {