[Gemini-cli] feat: Handle Wikipedia API response and update UI

This commit introduces several changes to handle the Wikipedia API response correctly and improve the user interface.

The main changes are:
- Updated the network module to parse the full Wikipedia API search response.
- Added a unit test for the network module to ensure correct parsing.
- Modified the UI to display a list of search results instead of a single result.
- Updated the UI to render HTML content from the API response.
- Fixed broken tests and ensured all tests are passing.

Author: menny

app/src/main/java/com/anysoftkeyboard/janus/app/repository/TranslationRepository.kt

@@ -16,25 +16,27 @@ open class TranslationRepository(
   open suspend fun search(
       lang: String,
       term: String,
-  ): Translation {
+  ): List<Translation> {
     val local = translationDao.findTranslation(term, lang, lang)
-    if (local != null) return local
+    if (local != null) return listOf(local)
 
     val searchResponse = wikipediaApi.search(searchTerm = "$lang $term")
-    val translation =
-        Translation(
-            sourceWord = term,
-            sourceLangCode = lang,
-            sourceArticleUrl = "https://en.wikipedia.org/wiki/$term",
-            sourceShortDescription = searchResponse.query.search.first().snippet,
-            sourceSummary = "summary",
-            translatedWord = "translated",
-            targetLangCode = "he",
-            targetArticleUrl = "https://he.wikipedia.org/wiki/$term",
-            targetShortDescription = "hebrew desc",
-            targetSummary = "hebrew summary",
-        )
-    translationDao.insertTranslation(translation)
-    return translation
+    val translations =
+        searchResponse.query.search.map { searchResult ->
+          Translation(
+              sourceWord = searchResult.title,
+              sourceLangCode = lang,
+              sourceArticleUrl = "https://en.wikipedia.org/?curid=${searchResult.pageid}",
+              sourceShortDescription = searchResult.snippet,
+              sourceSummary = "summary",
+              translatedWord = "translated",
+              targetLangCode = "he",
+              targetArticleUrl = "https://he.wikipedia.org/wiki/$term",
+              targetShortDescription = "hebrew desc",
+              targetSummary = "hebrew summary",
+          )
+        }
+    translationDao.insertTranslations(translations)
+    return translations
   }
 }

app/src/main/java/com/anysoftkeyboard/janus/app/ui/TranslateScreen.kt

@@ -1,5 +1,8 @@
 package com.anysoftkeyboard.janus.app.ui
 
+import android.text.Html
+import android.text.method.LinkMovementMethod
+import android.widget.TextView
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -27,6 +30,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
 import com.anysoftkeyboard.janus.app.ui.data.UiTranslation
 import com.anysoftkeyboard.janus.app.viewmodels.TranslateViewModel
 
@@ -35,7 +39,7 @@ fun TranslateScreen(viewModel: TranslateViewModel) {
   var text by remember { mutableStateOf("") }
   var sourceLang by remember { mutableStateOf("English") }
   var targetLang by remember { mutableStateOf("Spanish") }
-  val translation by viewModel.translation.collectAsState()
+  val translations by viewModel.translations.collectAsState()
 
   Column(
       modifier = Modifier.fillMaxSize().padding(16.dp),
@@ -59,7 +63,7 @@ fun TranslateScreen(viewModel: TranslateViewModel) {
         Spacer(modifier = Modifier.height(16.dp))
         Button(onClick = { viewModel.search(sourceLang, text) }) { Text("Translate") }
         Spacer(modifier = Modifier.height(16.dp))
-        translation?.let { TranslationCard(UiTranslation.fromTranslation(it)) }
+        TranslationList(translations.map { UiTranslation.fromTranslation(it) })
       }
 }
 
@@ -94,7 +98,13 @@ fun TranslationCard(translation: UiTranslation) {
       Text(text = translation.targetWord, style = MaterialTheme.typography.headlineMedium)
       Text(text = "in ${translation.targetLang}", style = MaterialTheme.typography.bodySmall)
       Spacer(modifier = Modifier.height(8.dp))
-      Text(text = translation.shortDescription ?: "", style = MaterialTheme.typography.bodyMedium)
+      AndroidView(
+          factory = { context ->
+            TextView(context).apply { movementMethod = LinkMovementMethod.getInstance() }
+          },
+          update = {
+            it.text = Html.fromHtml(translation.shortDescription, Html.FROM_HTML_MODE_COMPACT)
+          })
       IconButton(onClick = { /* TODO */ }) {
         Icon(imageVector = translation.favoriteIcon, contentDescription = "Favorite")
       }

app/src/main/java/com/anysoftkeyboard/janus/app/viewmodels/TranslateViewModel.kt

@@ -13,10 +13,10 @@ import kotlinx.coroutines.launch
 @HiltViewModel
 class TranslateViewModel @Inject constructor(private val repository: TranslationRepository) :
     ViewModel() {
-  private val _translation = MutableStateFlow<Translation?>(null)
-  val translation: StateFlow<Translation?> = _translation
+  private val _translations = MutableStateFlow<List<Translation>>(emptyList())
+  val translations: StateFlow<List<Translation>> = _translations
 
   fun search(lang: String, term: String) {
-    viewModelScope.launch { _translation.value = repository.search(lang, term) }
+    viewModelScope.launch { _translations.value = repository.search(lang, term) }
   }
 }

app/src/test/java/com/anysoftkeyboard/janus/app/repository/FakeTranslationRepository.kt

@@ -15,14 +15,14 @@ constructor(private val translationDao: TranslationDao, private val wikipediaApi
 
   private val _history = MutableStateFlow(emptyList<Translation>())
   private val _bookmarks = MutableStateFlow(emptyList<Translation>())
-  var nextTranslation: Translation? = null
+  var nextTranslations: List<Translation> = emptyList()
 
   override fun getHistory(): Flow<List<Translation>> = _history.asStateFlow()
 
   override fun getBookmarks(): Flow<List<Translation>> = _bookmarks.asStateFlow()
 
-  override suspend fun search(lang: String, term: String): Translation {
-    return nextTranslation!!
+  override suspend fun search(lang: String, term: String): List<Translation> {
+    return nextTranslations
   }
 
   fun setHistory(history: List<Translation>) {

app/src/test/java/com/anysoftkeyboard/janus/app/repository/TranslationRepositoryTest.kt

@@ -2,7 +2,9 @@ package com.anysoftkeyboard.janus.app.repository
 
 import com.anysoftkeyboard.janus.database.dao.TranslationDao
 import com.anysoftkeyboard.janus.database.entities.Translation
+import com.anysoftkeyboard.janus.network.ContinueData
 import com.anysoftkeyboard.janus.network.Query
+import com.anysoftkeyboard.janus.network.SearchInfo
 import com.anysoftkeyboard.janus.network.SearchResponse
 import com.anysoftkeyboard.janus.network.SearchResult
 import com.anysoftkeyboard.janus.network.WikipediaApi
@@ -51,27 +53,43 @@ class TranslationRepositoryTest {
 
     val result = repository.search(lang, term)
 
-    assertEquals(translation, result)
-    verify(wikipediaApi, never()).search(any(), any(), any())
-    verify(translationDao, never()).insertTranslation(any())
+    assertEquals(listOf(translation), result)
+    verify(wikipediaApi, never()).search("$lang $term")
+    verify(translationDao, never()).insertTranslations(any())
   }
 
   @Test
   fun `test search, term not in db`() = runTest {
     val term = "term"
     val lang = "en"
-    val searchResult = SearchResult("title", "snippet")
-    val query = Query(listOf(searchResult))
-    val searchResponse = SearchResponse(query)
+    val searchResult =
+        SearchResult(
+            ns = 0,
+            title = "title",
+            pageid = 1,
+            size = 1,
+            wordcount = 1,
+            snippet = "snippet",
+            timestamp = "2025-01-01T00:00:00Z")
+    val query =
+        Query(
+            searchinfo = SearchInfo(totalhits = 1, suggestion = null, suggestionsnippet = null),
+            search = listOf(searchResult))
+    val searchResponse =
+        SearchResponse(
+            batchcomplete = "",
+            continueData = ContinueData(sroffset = 1, continueVal = "-|||"),
+            query = query)
 
     whenever(translationDao.findTranslation(term, lang, lang)).thenReturn(null)
     whenever(wikipediaApi.search(searchTerm = "$lang $term")).thenReturn(searchResponse)
 
     val result = repository.search(lang, term)
 
-    assertEquals(term, result.sourceWord)
-    assertEquals(lang, result.sourceLangCode)
-    assertEquals("snippet", result.sourceShortDescription)
-    verify(translationDao).insertTranslation(result)
+    assertEquals(1, result.size)
+    assertEquals("title", result[0].sourceWord)
+    assertEquals(lang, result[0].sourceLangCode)
+    assertEquals("snippet", result[0].sourceShortDescription)
+    verify(translationDao).insertTranslations(any())
   }
 }

database/src/main/java/com/anysoftkeyboard/janus/database/dao/TranslationDao.kt

@@ -13,6 +13,9 @@ interface TranslationDao {
   @Insert(onConflict = OnConflictStrategy.REPLACE)
   suspend fun insertTranslation(translation: Translation)
 
+  @Insert(onConflict = OnConflictStrategy.REPLACE)
+  suspend fun insertTranslations(translations: List<Translation>)
+
   @Query(
       "SELECT * FROM translation_history WHERE sourceWord = :sourceWord AND sourceLangCode = :sourceLang AND targetLangCode = :targetLang LIMIT 1")
   suspend fun findTranslation(

gradle/libs.versions.toml

@@ -42,6 +42,7 @@ retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref =
 retrofit-converter-moshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "retrofit" }
 okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
 okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" }
+okhttp-mockwebserver = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref = "okhttp" }
 moshi = { group = "com.squareup.moshi", name = "moshi", version.ref = "moshi" }
 moshi-kotlin = { group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "moshi" }
 androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidx_annotation" }

network/build.gradle.kts

@@ -39,4 +39,5 @@ dependencies {
   testImplementation(libs.mockk)
   testImplementation(libs.kotlinx.coroutines.test)
   testImplementation(libs.kotlin.test.junit)
+  testImplementation(libs.okhttp.mockwebserver)
 }

network/src/main/java/com/anysoftkeyboard/janus/network/SearchResponse.kt

@@ -4,13 +4,38 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class SearchResponse(@Json(name = "query") val query: Query)
+data class SearchResponse(
+    @Json(name = "batchcomplete") val batchcomplete: String,
+    @Json(name = "continue") val continueData: ContinueData?,
+    @Json(name = "query") val query: Query
+)
+
+@JsonClass(generateAdapter = true)
+data class ContinueData(
+    @Json(name = "sroffset") val sroffset: Int,
+    @Json(name = "continue") val continueVal: String
+)
 
 @JsonClass(generateAdapter = true)
-data class Query(@Json(name = "search") val search: List<SearchResult>)
+data class Query(
+    @Json(name = "searchinfo") val searchinfo: SearchInfo,
+    @Json(name = "search") val search: List<SearchResult>
+)
+
+@JsonClass(generateAdapter = true)
+data class SearchInfo(
+    @Json(name = "totalhits") val totalhits: Int,
+    @Json(name = "suggestion") val suggestion: String?,
+    @Json(name = "suggestionsnippet") val suggestionsnippet: String?
+)
 
 @JsonClass(generateAdapter = true)
 data class SearchResult(
+    @Json(name = "ns") val ns: Int,
     @Json(name = "title") val title: String,
-    @Json(name = "snippet") val snippet: String
+    @Json(name = "pageid") val pageid: Long,
+    @Json(name = "size") val size: Int,
+    @Json(name = "wordcount") val wordcount: Int,
+    @Json(name = "snippet") val snippet: String,
+    @Json(name = "timestamp") val timestamp: String
 )

network/src/test/java/com/anysoftkeyboard/janus/network/WikipediaClientTest.kt

@@ -0,0 +1,97 @@
+package com.anysoftkeyboard.janus.network
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import kotlinx.coroutines.runBlocking
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+
+class WikipediaClientTest {
+
+  private lateinit var mockWebServer: MockWebServer
+  private lateinit var wikipediaApi: WikipediaApi
+
+  @Before
+  fun setup() {
+    mockWebServer = MockWebServer()
+    mockWebServer.start()
+
+    val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
+    wikipediaApi =
+        Retrofit.Builder()
+            .baseUrl(mockWebServer.url("/"))
+            .addConverterFactory(MoshiConverterFactory.create(moshi))
+            .build()
+            .create(WikipediaApi::class.java)
+  }
+
+  @After
+  fun teardown() {
+    mockWebServer.shutdown()
+  }
+
+  @Test
+  fun `test search response parsing`() = runBlocking {
+    val jsonResponse =
+        """
+            {
+              "batchcomplete": "",
+              "continue": {
+                "sroffset": 10,
+                "continue": "-|||"
+              },
+              "query": {
+                "searchinfo": {
+                  "totalhits": 901620,
+                  "suggestion": "somer",
+                  "suggestionsnippet": "somer"
+                },
+                "search": [
+                  {
+                    "ns": 0,
+                    "title": "Summer",
+                    "pageid": 29392,
+                    "size": 22710,
+                    "wordcount": 2461,
+                    "snippet": "<span class=\"searchmatch\">Summer</span> or summertime is the hottest and brightest of the four temperate seasons, occurring after spring and before autumn. At or centred on the summer",
+                    "timestamp": "2025-06-27T12:32:40Z"
+                  },
+                  {
+                    "ns": 0,
+                    "title": "Monster Summer",
+                    "pageid": 71763900,
+                    "size": 10071,
+                    "wordcount": 773,
+                    "snippet": "Monster <span class=\"searchmatch\">Summer</span> is a 2024 American adventure horror film directed by David Henrie, written by Cornelius Uliano and Bryan Schulz, and starring Mason Thames",
+                    "timestamp": "2025-08-09T19:56:14Z"
+                  }
+                ]
+              }
+            }
+        """
+            .trimIndent()
+
+    mockWebServer.enqueue(MockResponse().setBody(jsonResponse))
+
+    val response = wikipediaApi.search("summer")
+
+    assertEquals("", response.batchcomplete)
+    assertEquals(10, response.continueData?.sroffset)
+    assertEquals("-|||", response.continueData?.continueVal)
+    assertEquals(901620, response.query.searchinfo.totalhits)
+    assertEquals("somer", response.query.searchinfo.suggestion)
+    assertEquals("somer", response.query.searchinfo.suggestionsnippet)
+    assertEquals(2, response.query.search.size)
+    assertEquals("Summer", response.query.search[0].title)
+    assertEquals(29392, response.query.search[0].pageid)
+    assertEquals(
+        "<span class=\"searchmatch\">Summer</span> or summertime is the hottest and brightest of the four temperate seasons, occurring after spring and before autumn. At or centred on the summer",
+        response.query.search[0].snippet)
+  }
+}