Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/parity/session.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
Expand All @@ -92,6 +93,7 @@ import androidx.compose.ui.unit.sp
import androidx.lifecycle.compose.currentStateAsState
import ai.opencode.server.OpenCodeServer
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
Expand Down Expand Up @@ -224,6 +226,7 @@ data class SessionSheetDetails(
* @param sheet the session's `sessionSheet` child store.
* @param details what the sheet reads from the session ([SessionSheetDetails]).
* @param onModelTapped `SessionFeature.Action.modelButtonTapped`.
* @param onMediaTapped `SessionFeature.Action.SessionMediaTapped`.
* @param onDismissRequest the sheet was swiped or tapped away.
* @param statusOrb Draws the status orb; the default is a plain dot.
* @param providerIcon Draws the model's provider mark, sized by the caller.
Expand All @@ -235,13 +238,19 @@ fun SessionSheetView(
context: SessionListContext,
details: SessionSheetDetails,
onModelTapped: () -> Unit,
onMediaTapped: () -> Unit,
onDismissRequest: () -> Unit,
statusOrb: @Composable (status: SessionSheetStatus, size: Dp) -> Unit = { status, size -> DefaultStatusOrb(status, size) },
providerIcon: (@Composable (providerID: String, canonicalProviderID: String?, size: Dp) -> Unit)? = null,
) {
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
val scope = rememberCoroutineScope()
val openMedia = {
onMediaTapped()
scope.launch { sheetState.hide() }.invokeOnCompletion { onDismissRequest() }
}
OpenCodeBottomSheet(onDismissRequest = onDismissRequest, sheetState = sheetState) {
SessionSheetContent(sheet, context, details, onModelTapped, statusOrb, providerIcon)
SessionSheetContent(sheet, context, details, onModelTapped, { openMedia() }, statusOrb, providerIcon)
SessionActionPresentations(sheet, title = details.session?.title)
}
}
Expand All @@ -252,6 +261,7 @@ private fun SessionSheetContent(
context: SessionListContext,
details: SessionSheetDetails,
onModelTapped: () -> Unit,
onMediaTapped: () -> Unit,
statusOrb: @Composable (SessionSheetStatus, Dp) -> Unit,
providerIcon: (@Composable (String, String?, Dp) -> Unit)?,
) {
Expand All @@ -270,6 +280,7 @@ private fun SessionSheetContent(
Hero(state, details, context, statusOrb, onRename = { sheet.send(SessionSheetFeature.Action.RenameTapped(details.session?.let { if (it.isUntitled) "" else it.title }.orEmpty())) })
Tiles(state, isListRow, context, details.session?.title, sheet::send)
DetailsCard(details, onModelTapped, providerIcon)
MediaCard(onMediaTapped)
if (isListRow && notificationsAvailable) {
AlwaysNotifyCard(isOn = state.alwaysNotifyPending ?: details.session?.alwaysNotify ?: false, isPending = state.alwaysNotifyPending != null) {
sheet.send(SessionSheetFeature.Action.AlwaysNotifyToggled(it))
Expand Down Expand Up @@ -356,6 +367,7 @@ fun SessionSheetPrewarm(
2 -> Tiles(warm.state, isListRow = true, warm.context, title = null, send = { })
3 -> DetailsCard(warm.details, onModelTapped = { }, providerIcon)
else -> {
MediaCard { }
AlwaysNotifyCard(isOn = false, isPending = false) { }
DeleteRow(enabled = true) { }
rememberModalBottomSheetState(skipPartiallyExpanded = true)
Expand Down Expand Up @@ -819,6 +831,33 @@ private fun CostRow(details: SessionSheetDetails) {
}
}

// MARK: Media

@Composable
private fun MediaCard(onClick: () -> Unit) {
val mediaLabel = stringResource(R.string.session_sheet_media)
val mediaValue = stringResource(R.string.session_sheet_media_value)
DetailRow(
mediaLabel,
Modifier
.testTag("session-sheet-media")
.background(cardFill(), cardShape)
.openCodeHairline(cardShape)
.clip(cardShape)
.clickable(role = Role.Button, onClick = onClick)
.clearAndSetSemantics {
contentDescription = mediaLabel
stateDescription = mediaValue
role = Role.Button
},
) {
Row(horizontalArrangement = Arrangement.spacedBy(7.dp), verticalAlignment = Alignment.CenterVertically) {
Text(mediaValue, style = OpenCodeTextStyles.callout, color = OpenCodeTheme.colors.secondaryText, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false))
OpenCodeIcon(SFSymbol.ChevronRight, contentDescription = null, size = 16.dp, tint = OpenCodeTheme.colors.tertiaryText)
}
}
}

// MARK: Always Notify

@Composable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,7 @@ private fun SessionSheets(store: StoreOf<State, Action>, listContext: SessionLis
context = listContext,
details = details,
onModelTapped = { store.send(Action.ModelButtonTapped) },
onMediaTapped = { store.send(Action.SessionMediaTapped) },
onDismissRequest = dismiss,
providerIcon = { providerID, canonical, size -> ProviderIcon(providerID, Modifier.size(size), canonical) },
statusOrb = { status, size ->
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-am/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">ያልታወቀ</string>
<string name="session_sheet_context_tokens">%1$s ቶከኖች</string>
<string name="session_sheet_cost">ወጪ</string>
<string name="session_sheet_media">ሚዲያ</string>
<string name="session_sheet_media_value">ፋይሎች እና አገናኞች</string>
<string name="session_always_notify">ሁልጊዜ አሳውቅ</string>
<string name="session_always_notify_message_phone">ከዚህ ያልተላኩ መልእክቶችንም ጨምሮ፣ ምላሽ ባለቀ ቁጥር በዚህ ስልክ አሳውቅ።</string>
<string name="session_always_notify_message_tablet">ከዚህ ያልተላኩ መልእክቶችንም ጨምሮ፣ ምላሽ ባለቀ ቁጥር በዚህ ታብሌት አሳውቅ።</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-az/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Naməlum</string>
<string name="session_sheet_context_tokens">%1$s token</string>
<string name="session_sheet_cost">Xərc</string>
<string name="session_sheet_media">Media</string>
<string name="session_sheet_media_value">Fayllar və linklər</string>
<string name="session_always_notify">Həmişə bildir</string>
<string name="session_always_notify_message_phone">Mesajı buradan göndərməsəniz belə, hər cavab tamamlananda bu telefona bildiriş göndər.</string>
<string name="session_always_notify_message_tablet">Mesajı buradan göndərməsəniz belə, hər cavab tamamlananda bu planşetə bildiriş göndər.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Неизвестен</string>
<string name="session_sheet_context_tokens">%1$s токена</string>
<string name="session_sheet_cost">Цена</string>
<string name="session_sheet_media">Медия</string>
<string name="session_sheet_media_value">Файлове и връзки</string>
<string name="session_always_notify">Винаги известявай</string>
<string name="session_always_notify_message_phone">Известяване на този телефон при всеки готов отговор, дори за съобщения, изпратени от друго устройство.</string>
<string name="session_always_notify_message_tablet">Известяване на този таблет при всеки готов отговор, дори за съобщения, изпратени от друго устройство.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">অজানা</string>
<string name="session_sheet_context_tokens">%1$s টোকেন</string>
<string name="session_sheet_cost">খরচ</string>
<string name="session_sheet_media">মিডিয়া</string>
<string name="session_sheet_media_value">ফাইল ও লিঙ্ক</string>
<string name="session_always_notify">সবসময় জানান</string>
<string name="session_always_notify_message_phone">প্রতিটি জবাব শেষ হলে এই ফোনে জানান, এমনকি বার্তা এখান থেকে না পাঠালেও।</string>
<string name="session_always_notify_message_tablet">প্রতিটি জবাব শেষ হলে এই ট্যাবলেটে জানান, এমনকি বার্তা এখান থেকে না পাঠালেও।</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-bs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Nepoznato</string>
<string name="session_sheet_context_tokens">%1$s tokena</string>
<string name="session_sheet_cost">Trošak</string>
<string name="session_sheet_media">Mediji</string>
<string name="session_sheet_media_value">Datoteke i linkovi</string>
<string name="session_always_notify">Uvijek obavijesti</string>
<string name="session_always_notify_message_phone">Obavijesti ovaj telefon kad god je odgovor spreman, čak i na poruke poslane s drugog uređaja.</string>
<string name="session_always_notify_message_tablet">Obavijesti ovaj tablet kad god je odgovor spreman, čak i na poruke poslane s drugog uređaja.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Desconegut</string>
<string name="session_sheet_context_tokens">%1$s tokens</string>
<string name="session_sheet_cost">Cost</string>
<string name="session_sheet_media">Multimèdia</string>
<string name="session_sheet_media_value">Fitxers i enllaços</string>
<string name="session_always_notify">Notifica sempre</string>
<string name="session_always_notify_message_phone">Notifica en aquest mòbil quan s\'acabi una resposta, encara que no l\'hagis demanat des d\'aquí.</string>
<string name="session_always_notify_message_tablet">Notifica en aquesta tauleta quan s\'acabi una resposta, encara que no l\'hagis demanat des d\'aquí.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Neznámý</string>
<string name="session_sheet_context_tokens">%1$s tokenů</string>
<string name="session_sheet_cost">Cena</string>
<string name="session_sheet_media">Média</string>
<string name="session_sheet_media_value">Soubory a odkazy</string>
<string name="session_always_notify">Vždy upozornit</string>
<string name="session_always_notify_message_phone">Upozornit na tomto telefonu po dokončení každé odpovědi, i na zprávy odeslané odjinud.</string>
<string name="session_always_notify_message_tablet">Upozornit na tomto tabletu po dokončení každé odpovědi, i na zprávy odeslané odjinud.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Ukendt</string>
<string name="session_sheet_context_tokens">%1$s tokens</string>
<string name="session_sheet_cost">Pris</string>
<string name="session_sheet_media">Medier</string>
<string name="session_sheet_media_value">Filer og links</string>
<string name="session_always_notify">Giv altid besked</string>
<string name="session_always_notify_message_phone">Giv besked på denne telefon, når et svar er klar, også hvis du ikke skrev herfra.</string>
<string name="session_always_notify_message_tablet">Giv besked på denne tablet, når et svar er klar, også hvis du ikke skrev herfra.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">unbekannt</string>
<string name="session_sheet_context_tokens">%1$s Tokens</string>
<string name="session_sheet_cost">Kosten</string>
<string name="session_sheet_media">Medien</string>
<string name="session_sheet_media_value">Dateien und Links</string>
<string name="session_always_notify">Immer benachrichtigen</string>
<string name="session_always_notify_message_phone">Dieses Handy bei jeder fertigen Antwort benachrichtigen, auch auf Nachrichten von anderen Geräten.</string>
<string name="session_always_notify_message_tablet">Dieses Tablet bei jeder fertigen Antwort benachrichtigen, auch auf Nachrichten von anderen Geräten.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-dz/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">མ་ཤེསཔ་</string>
<string name="session_sheet_context_tokens">ཊོ་ཀེན་ %1$s</string>
<string name="session_sheet_cost">ཟད་འགྲོ།</string>
<string name="session_sheet_media">བརྡ་བརྒྱུད།</string>
<string name="session_sheet_media_value">ཡིག་སྣོད་དང་འབྲེལ་མཐུད་ཚུ།</string>
<string name="session_always_notify">ཨ་རྟག་ར་བརྡ་བསྐུལ་འབད།</string>
<string name="session_always_notify_message_phone">ནཱ་ལས་མ་བཏང་མི་ཚུ་ཨིན་རུང་ ལན་འདེབས་རེ་མཇུག་བསྡུཝ་ད་ འགྲུལ་འཕྲིན་འདི་ལུ་བརྡ་བསྐུལ་འབད།</string>
<string name="session_always_notify_message_tablet">ནཱ་ལས་མ་བཏང་མི་ཚུ་ཨིན་རུང་ ལན་འདེབས་རེ་མཇུག་བསྡུཝ་ད་ ཊེབ་ལེཊ་འདི་ལུ་བརྡ་བསྐུལ་འབད།</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Άγνωστο</string>
<string name="session_sheet_context_tokens">%1$s διακριτικά</string>
<string name="session_sheet_cost">Κόστος</string>
<string name="session_sheet_media">Πολυμέσα</string>
<string name="session_sheet_media_value">Αρχεία και σύνδεσμοι</string>
<string name="session_always_notify">Ειδοποίηση πάντα</string>
<string name="session_always_notify_message_phone">Ειδοποίηση σε αυτό το κινητό όταν ολοκληρώνεται μια απάντηση, ακόμα κι αν το μήνυμα στάλθηκε από αλλού.</string>
<string name="session_always_notify_message_tablet">Ειδοποίηση σε αυτό το τάμπλετ όταν ολοκληρώνεται μια απάντηση, ακόμα κι αν το μήνυμα στάλθηκε από αλλού.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Desconocido</string>
<string name="session_sheet_context_tokens">%1$s tokens</string>
<string name="session_sheet_cost">Coste</string>
<string name="session_sheet_media">Multimedia</string>
<string name="session_sheet_media_value">Archivos y enlaces</string>
<string name="session_always_notify">Notificar siempre</string>
<string name="session_always_notify_message_phone">Notificar en este teléfono al terminar cada respuesta, aunque el mensaje no se haya enviado desde aquí.</string>
<string name="session_always_notify_message_tablet">Notificar en esta tableta al terminar cada respuesta, aunque el mensaje no se haya enviado desde aquí.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-et/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Teadmata</string>
<string name="session_sheet_context_tokens">%1$s tokenit</string>
<string name="session_sheet_cost">Kulu</string>
<string name="session_sheet_media">Meedia</string>
<string name="session_sheet_media_value">Failid ja lingid</string>
<string name="session_always_notify">Teavita alati</string>
<string name="session_always_notify_message_phone">Teavita selles telefonis iga vastuse valmimisest, ka siis, kui päring saadeti mujalt.</string>
<string name="session_always_notify_message_tablet">Teavita selles tahvelarvutis iga vastuse valmimisest, ka siis, kui päring saadeti mujalt.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Tuntematon</string>
<string name="session_sheet_context_tokens">%1$s tokenia</string>
<string name="session_sheet_cost">Kustannus</string>
<string name="session_sheet_media">Media</string>
<string name="session_sheet_media_value">Tiedostot ja linkit</string>
<string name="session_always_notify">Ilmoita aina</string>
<string name="session_always_notify_message_phone">Ilmoita tähän puhelimeen aina, kun vastaus valmistuu, myös muualla lähetettyihin viesteihin.</string>
<string name="session_always_notify_message_tablet">Ilmoita tähän tablettiin aina, kun vastaus valmistuu, myös muualla lähetettyihin viesteihin.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-fo/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Ókent</string>
<string name="session_sheet_context_tokens">%1$s token</string>
<string name="session_sheet_cost">Kostnaður</string>
<string name="session_sheet_media">Miðlar</string>
<string name="session_sheet_media_value">Fílur og leinkjur</string>
<string name="session_always_notify">Boða altíð frá</string>
<string name="session_always_notify_message_phone">Boða frá á hesi telefonini, tá ið eitt svar er liðugt, eisini tá ið boðini ikki vórðu send hiðani.</string>
<string name="session_always_notify_message_tablet">Boða frá á hesum teldlinum, tá ið eitt svar er liðugt, eisini tá ið boðini ikki vórðu send hiðani.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">Inconnu</string>
<string name="session_sheet_context_tokens">%1$s jetons</string>
<string name="session_sheet_cost">Coût</string>
<string name="session_sheet_media">Médias</string>
<string name="session_sheet_media_value">Fichiers et liens</string>
<string name="session_always_notify">Toujours notifier</string>
<string name="session_always_notify_message_phone">Notifier ce téléphone à chaque réponse terminée, même si le message n’a pas été envoyé d’ici.</string>
<string name="session_always_notify_message_tablet">Notifier cette tablette à chaque réponse terminée, même si le message n’a pas été envoyé d’ici.</string>
Expand Down
2 changes: 2 additions & 0 deletions feature/session/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="session_sheet_unknown_description">अज्ञात</string>
<string name="session_sheet_context_tokens">%1$s टोकन</string>
<string name="session_sheet_cost">लागत</string>
<string name="session_sheet_media">मीडिया</string>
<string name="session_sheet_media_value">फ़ाइलें और लिंक</string>
<string name="session_always_notify">हमेशा सूचना दें</string>
<string name="session_always_notify_message_phone">हर जवाब पूरा होने पर इस फ़ोन पर सूचना दें, भले ही संदेश यहाँ से न भेजा गया हो।</string>
<string name="session_always_notify_message_tablet">हर जवाब पूरा होने पर इस टैबलेट पर सूचना दें, भले ही संदेश यहाँ से न भेजा गया हो।</string>
Expand Down
Loading
Loading