diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Git.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Git.kt index db61b42ddd..be5287f719 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Git.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Git.kt @@ -60,6 +60,7 @@ import com.vitorpamplona.amethyst.commons.model.toImmutableListOfLists import com.vitorpamplona.amethyst.commons.nip34Git.GitBrowseState import com.vitorpamplona.amethyst.commons.nip34Git.GitRepoSnapshotCache import com.vitorpamplona.amethyst.commons.nip34Git.GitRepositoryBrowserViewModel +import com.vitorpamplona.amethyst.commons.ui.note.StatusKind import com.vitorpamplona.amethyst.model.AddressableNote import com.vitorpamplona.amethyst.model.GitPullRequestUpdateIndex import com.vitorpamplona.amethyst.model.Note diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/GitStatusPill.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/GitStatusPill.kt index 443ca59ad1..826513ed22 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/GitStatusPill.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/GitStatusPill.kt @@ -20,44 +20,19 @@ */ package com.vitorpamplona.amethyst.ui.note.types -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.vitorpamplona.amethyst.R -import com.vitorpamplona.amethyst.commons.icons.symbols.Icon -import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbol -import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols +import com.vitorpamplona.amethyst.commons.ui.note.GitStatusPill +import com.vitorpamplona.amethyst.commons.ui.note.StatusKind import com.vitorpamplona.amethyst.model.GitStatusIndex -import com.vitorpamplona.amethyst.ui.stringRes import com.vitorpamplona.quartz.nip34Git.status.GitStatusAppliedEvent import com.vitorpamplona.quartz.nip34Git.status.GitStatusClosedEvent import com.vitorpamplona.quartz.nip34Git.status.GitStatusDraftEvent import com.vitorpamplona.quartz.nip34Git.status.GitStatusEvent import com.vitorpamplona.quartz.nip34Git.status.GitStatusOpenEvent -private val PillShape = RoundedCornerShape(8.dp) - -enum class StatusKind { - OPEN, - APPLIED, - CLOSED, - DRAFT, -} - private fun GitStatusEvent.statusKind(): StatusKind = when (this) { is GitStatusAppliedEvent -> StatusKind.APPLIED @@ -67,6 +42,11 @@ private fun GitStatusEvent.statusKind(): StatusKind = else -> StatusKind.OPEN } +/** + * Entry point: resolves the latest NIP-34 status for [targetIdHex] from the account's + * [GitStatusIndex] and renders the shared commons [GitStatusPill]. Reading the index is + * account/relay-bound state, so it stays native; the pill itself is pure commons UI. + */ @Composable fun GitStatusPill( targetIdHex: String, @@ -79,78 +59,3 @@ fun GitStatusPill( GitStatusPill(kind, modifier) } - -@Composable -fun GitStatusPill( - kind: StatusKind, - modifier: Modifier = Modifier, -) { - val (label, symbol, container, content) = - when (kind) { - StatusKind.OPEN -> { - StatusStyle( - label = stringRes(id = R.string.git_status_open), - symbol = MaterialSymbols.RadioButtonChecked, - container = Color(0xFF1F883D), - content = Color.White, - ) - } - - StatusKind.APPLIED -> { - StatusStyle( - label = stringRes(id = R.string.git_status_merged), - symbol = MaterialSymbols.Check, - container = Color(0xFF8250DF), - content = Color.White, - ) - } - - StatusKind.CLOSED -> { - StatusStyle( - label = stringRes(id = R.string.git_status_closed), - symbol = MaterialSymbols.Cancel, - container = Color(0xFFCF222E), - content = Color.White, - ) - } - - StatusKind.DRAFT -> { - StatusStyle( - label = stringRes(id = R.string.git_status_draft), - symbol = MaterialSymbols.EditNote, - container = MaterialTheme.colorScheme.surfaceVariant, - content = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - } - - Row( - modifier = - modifier - .clip(PillShape) - .background(container) - .padding(horizontal = 8.dp, vertical = 2.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(4.dp), - ) { - Icon( - symbol = symbol, - contentDescription = null, - modifier = Modifier.size(12.dp), - tint = content, - ) - Text( - text = label, - style = MaterialTheme.typography.labelSmall, - fontWeight = FontWeight.SemiBold, - color = content, - ) - } -} - -private data class StatusStyle( - val label: String, - val symbol: MaterialSymbol, - val container: Color, - val content: Color, -) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepo/GitItemListRow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepo/GitItemListRow.kt index 5b5f3c91e4..435e38cd83 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepo/GitItemListRow.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepo/GitItemListRow.kt @@ -51,6 +51,7 @@ import com.vitorpamplona.amethyst.commons.icons.symbols.Icon import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols import com.vitorpamplona.amethyst.commons.ui.feeds.FeedState import com.vitorpamplona.amethyst.commons.ui.layouts.rememberFeedContentPadding +import com.vitorpamplona.amethyst.commons.ui.note.StatusKind import com.vitorpamplona.amethyst.model.GitPullRequestUpdateIndex import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.ui.navigation.navs.INav @@ -65,7 +66,6 @@ import com.vitorpamplona.amethyst.ui.note.clickableNoteModifier import com.vitorpamplona.amethyst.ui.note.elements.MoreOptionsButton import com.vitorpamplona.amethyst.ui.note.elements.TimeAgo import com.vitorpamplona.amethyst.ui.note.types.GitStatusPill -import com.vitorpamplona.amethyst.ui.note.types.StatusKind import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.stringRes import com.vitorpamplona.amethyst.ui.theme.DividerThickness diff --git a/amethyst/src/main/res/values-ar-rSA/strings.xml b/amethyst/src/main/res/values-ar-rSA/strings.xml index 7f0ee33fb2..80900017b2 100644 --- a/amethyst/src/main/res/values-ar-rSA/strings.xml +++ b/amethyst/src/main/res/values-ar-rSA/strings.xml @@ -2320,10 +2320,6 @@ مُفرَّع من الويب: استنساخ: - مفتوح - مدمج - مغلق - مسودة نظرة عامة المشكلات التصحيحات وطلبات السحب diff --git a/amethyst/src/main/res/values-bn-rBD/strings.xml b/amethyst/src/main/res/values-bn-rBD/strings.xml index 6b07cf93f3..95c019850d 100644 --- a/amethyst/src/main/res/values-bn-rBD/strings.xml +++ b/amethyst/src/main/res/values-bn-rBD/strings.xml @@ -2224,10 +2224,6 @@ থেকে ফর্ক করা হয়েছে ওয়েব: ক্লোন: - খোলা - মার্জ করা হয়েছে - বন্ধ - ড্রাফট ওভারভিউ ইস্যু প্যাচ & PR diff --git a/amethyst/src/main/res/values-cs/strings.xml b/amethyst/src/main/res/values-cs/strings.xml index f2340bfb72..14fd3808de 100644 --- a/amethyst/src/main/res/values-cs/strings.xml +++ b/amethyst/src/main/res/values-cs/strings.xml @@ -3027,10 +3027,6 @@ Commit Základ sloučení Pull request byl aktualizován na nový commit. - Otevřeno - Sloučeno - Uzavřeno - Koncept Přehled Úkoly Patche a PR diff --git a/amethyst/src/main/res/values-de-rDE/strings.xml b/amethyst/src/main/res/values-de-rDE/strings.xml index 25ba00ad29..1191b8d866 100644 --- a/amethyst/src/main/res/values-de-rDE/strings.xml +++ b/amethyst/src/main/res/values-de-rDE/strings.xml @@ -2945,10 +2945,6 @@ Commit Merge-Basis Der Pull-Request wurde auf einen neuen Commit aktualisiert. - Offen - Zusammengeführt - Geschlossen - Entwurf Übersicht Tickets Patches und PRs diff --git a/amethyst/src/main/res/values-de/strings.xml b/amethyst/src/main/res/values-de/strings.xml index 33afa5019d..19d5c1ac0f 100644 --- a/amethyst/src/main/res/values-de/strings.xml +++ b/amethyst/src/main/res/values-de/strings.xml @@ -3475,13 +3475,9 @@ anz der Bedingungen ist erforderlich Als ZIP exportieren (JSON) -Offen -Zusammengeführt -Geschlossen -Entwurf Übersicht diff --git a/amethyst/src/main/res/values-el-rGR/strings.xml b/amethyst/src/main/res/values-el-rGR/strings.xml index bd79b7ef6a..c2369dfec2 100644 --- a/amethyst/src/main/res/values-el-rGR/strings.xml +++ b/amethyst/src/main/res/values-el-rGR/strings.xml @@ -2204,10 +2204,6 @@ Διακλαδώθηκε από Ιστός: Κλωνοποίηση: - Ανοιχτό - Συγχωνευμένο - Κλειστό - Πρόχειρο Επισκόπηση Ζητήματα Επιδιορθώσεις & PRs diff --git a/amethyst/src/main/res/values-eo-rUY/strings.xml b/amethyst/src/main/res/values-eo-rUY/strings.xml index a5a7944fb1..b6543ffadb 100644 --- a/amethyst/src/main/res/values-eo-rUY/strings.xml +++ b/amethyst/src/main/res/values-eo-rUY/strings.xml @@ -2228,10 +2228,6 @@ Forketita de Retejo: Kloni: - Malferma - Kunfandita - Fermita - Malneto Superrigardo Problemoj Flikoj & PR-oj diff --git a/amethyst/src/main/res/values-eo/strings.xml b/amethyst/src/main/res/values-eo/strings.xml index 2d610d685d..2c90f06423 100644 --- a/amethyst/src/main/res/values-eo/strings.xml +++ b/amethyst/src/main/res/values-eo/strings.xml @@ -2105,10 +2105,6 @@ Forketita de Retejo: Kloni: -Malferma -Kunfandita -Fermita -Malneto Superrigardo Problemoj Flikoj & PR-oj diff --git a/amethyst/src/main/res/values-es-rES/strings.xml b/amethyst/src/main/res/values-es-rES/strings.xml index 4595015c63..d1b3c3952b 100644 --- a/amethyst/src/main/res/values-es-rES/strings.xml +++ b/amethyst/src/main/res/values-es-rES/strings.xml @@ -2283,10 +2283,6 @@ Confirmar Fusionar base Se actualizó la solicitud de incorporación de cambios con una nueva confirmación. - Abierto - Fusionado - Cerrado - Borrador Resumen Incidencias Parches y PRs diff --git a/amethyst/src/main/res/values-es-rMX/strings.xml b/amethyst/src/main/res/values-es-rMX/strings.xml index 8ac0a50bd3..6dff168e6a 100644 --- a/amethyst/src/main/res/values-es-rMX/strings.xml +++ b/amethyst/src/main/res/values-es-rMX/strings.xml @@ -2274,10 +2274,6 @@ Confirmar Fusionar base Se actualizó la solicitud de incorporación de cambios con una nueva confirmación. - Abierto - Fusionado - Cerrado - Borrador Resumen Incidencias Parches y PRs diff --git a/amethyst/src/main/res/values-es-rUS/strings.xml b/amethyst/src/main/res/values-es-rUS/strings.xml index 76ac01c013..ccf62ecc52 100644 --- a/amethyst/src/main/res/values-es-rUS/strings.xml +++ b/amethyst/src/main/res/values-es-rUS/strings.xml @@ -2274,10 +2274,6 @@ Confirmar Fusionar base Se actualizó la solicitud de incorporación de cambios con una nueva confirmación. - Abierto - Fusionado - Cerrado - Borrador Resumen Incidencias Parches y PRs diff --git a/amethyst/src/main/res/values-es/strings.xml b/amethyst/src/main/res/values-es/strings.xml index 8af516d72d..316b35924e 100644 --- a/amethyst/src/main/res/values-es/strings.xml +++ b/amethyst/src/main/res/values-es/strings.xml @@ -4946,13 +4946,9 @@ Exportar como ZIP (JSON) -Abierto -Fusionado -Cerrado -Borrador Resumen diff --git a/amethyst/src/main/res/values-fa-rIR/strings.xml b/amethyst/src/main/res/values-fa-rIR/strings.xml index 437d0674a7..ab4d4bd819 100644 --- a/amethyst/src/main/res/values-fa-rIR/strings.xml +++ b/amethyst/src/main/res/values-fa-rIR/strings.xml @@ -2244,10 +2244,6 @@ انشعاب شده از وب: نسخه برداری: - باز - ادغام شده - بسته - پیش‌نویس مرور کلی مشکلات وصله‌ها و PR‌ها diff --git a/amethyst/src/main/res/values-fa/strings.xml b/amethyst/src/main/res/values-fa/strings.xml index 1cf69b0c1c..8db85f6334 100644 --- a/amethyst/src/main/res/values-fa/strings.xml +++ b/amethyst/src/main/res/values-fa/strings.xml @@ -2477,13 +2477,9 @@ خروجی به صورت ZIP (JSON) - باز - ادغام شده - بسته - پیش‌نویس مرور کلی diff --git a/amethyst/src/main/res/values-fi-rFI/strings.xml b/amethyst/src/main/res/values-fi-rFI/strings.xml index f1f167d01c..4eb06ba507 100644 --- a/amethyst/src/main/res/values-fi-rFI/strings.xml +++ b/amethyst/src/main/res/values-fi-rFI/strings.xml @@ -2210,10 +2210,6 @@ Haaroitettu kohteesta Verkko: Kloonaa: - Avoin - Yhdistetty - Suljettu - Luonnos Yleiskatsaus Ongelmat Korjaukset & PR:t diff --git a/amethyst/src/main/res/values-fr-rCA/strings.xml b/amethyst/src/main/res/values-fr-rCA/strings.xml index fd0d697774..b2d283248b 100644 --- a/amethyst/src/main/res/values-fr-rCA/strings.xml +++ b/amethyst/src/main/res/values-fr-rCA/strings.xml @@ -2149,10 +2149,6 @@ Forké depuis Web : Clone : - Ouvert - Fusionné - Fermé - Brouillon Aperçu Problèmes Correctifs & PRs diff --git a/amethyst/src/main/res/values-fr-rFR/strings.xml b/amethyst/src/main/res/values-fr-rFR/strings.xml index 5a895a6971..3b74e80ccd 100644 --- a/amethyst/src/main/res/values-fr-rFR/strings.xml +++ b/amethyst/src/main/res/values-fr-rFR/strings.xml @@ -2456,10 +2456,6 @@ Clone : Branche Commit - Ouvert - Fusionné - Fermé - Brouillon Aperçu Problèmes Correctifs & PRs diff --git a/amethyst/src/main/res/values-fr/strings.xml b/amethyst/src/main/res/values-fr/strings.xml index 6bb2c6ea7c..3e8f9f2525 100644 --- a/amethyst/src/main/res/values-fr/strings.xml +++ b/amethyst/src/main/res/values-fr/strings.xml @@ -4104,13 +4104,9 @@ Exporter les paramètres de relais -Ouvert -Fusionné -Fermé -Brouillon Aperçu diff --git a/amethyst/src/main/res/values-hi-rIN/strings.xml b/amethyst/src/main/res/values-hi-rIN/strings.xml index da30790f5c..00f43a46a7 100644 --- a/amethyst/src/main/res/values-hi-rIN/strings.xml +++ b/amethyst/src/main/res/values-hi-rIN/strings.xml @@ -2859,10 +2859,6 @@ स्थायी अभिलेखन मूल विलय कर्षण अनुरोध का अद्यतन किया गया एक नए स्थायी अभिलेखन तक। - खुला - विलीन - आवृत - पाण्डुलिपि रूपरेखा विवरण समस्याएँ सुधारलेख तथा पीआर॰ diff --git a/amethyst/src/main/res/values-hu-rHU/strings.xml b/amethyst/src/main/res/values-hu-rHU/strings.xml index 7b7fb7535c..f1b981da43 100644 --- a/amethyst/src/main/res/values-hu-rHU/strings.xml +++ b/amethyst/src/main/res/values-hu-rHU/strings.xml @@ -2831,10 +2831,6 @@ Véglegesítés Alap beolvasztása A beolvasztási kérés frissítve lett egy új véglegesítésbe. - Nyitva - Beolvasztva - Lezárva - Vázlat Áttekintés Hibajegyek Foltok és beolvasztási kérések diff --git a/amethyst/src/main/res/values-in-rID/strings.xml b/amethyst/src/main/res/values-in-rID/strings.xml index df719bea03..ef893d4ebe 100644 --- a/amethyst/src/main/res/values-in-rID/strings.xml +++ b/amethyst/src/main/res/values-in-rID/strings.xml @@ -2161,9 +2161,6 @@ Seharusnya %3$s Terima kasih! Penulisan Terbatas Diturunkan dari - Terbuka - Digabungkan - Ditutup Ikhtisar Isu Patch & PR diff --git a/amethyst/src/main/res/values-in/strings.xml b/amethyst/src/main/res/values-in/strings.xml index bcb14b65b9..70e14ce2cf 100644 --- a/amethyst/src/main/res/values-in/strings.xml +++ b/amethyst/src/main/res/values-in/strings.xml @@ -2686,13 +2686,9 @@ Clone: - Terbuka - Digabungkan - Ditutup - Draft Ikhtisar diff --git a/amethyst/src/main/res/values-it-rIT/strings.xml b/amethyst/src/main/res/values-it-rIT/strings.xml index 72ac9a9c61..53498d61f9 100644 --- a/amethyst/src/main/res/values-it-rIT/strings.xml +++ b/amethyst/src/main/res/values-it-rIT/strings.xml @@ -2179,10 +2179,6 @@ Grazie! Scritture limitate Fork da - Aperto - Unito - Chiuso - Bozza Panoramica Patch & PR Informazioni diff --git a/amethyst/src/main/res/values-ja-rJP/strings.xml b/amethyst/src/main/res/values-ja-rJP/strings.xml index 41a22222cf..3a3b391055 100644 --- a/amethyst/src/main/res/values-ja-rJP/strings.xml +++ b/amethyst/src/main/res/values-ja-rJP/strings.xml @@ -2198,10 +2198,6 @@ 書き込み制限あり フォーク元 クローン: - オープン - マージ済み - クローズ済み - 下書き 概要 イシュー パッチ & PR diff --git a/amethyst/src/main/res/values-ja/strings.xml b/amethyst/src/main/res/values-ja/strings.xml index 59ec50d5b1..d04500a0b8 100644 --- a/amethyst/src/main/res/values-ja/strings.xml +++ b/amethyst/src/main/res/values-ja/strings.xml @@ -2778,13 +2778,9 @@ クローン: - オープン - マージ済み - クローズ済み - 下書き 概要 diff --git a/amethyst/src/main/res/values-ko-rKR/strings.xml b/amethyst/src/main/res/values-ko-rKR/strings.xml index 02d2467b9d..715a17f30f 100644 --- a/amethyst/src/main/res/values-ko-rKR/strings.xml +++ b/amethyst/src/main/res/values-ko-rKR/strings.xml @@ -2187,10 +2187,6 @@ 제한된 쓰기 포크 출처 웹: - 열림 - 병합됨 - 닫힘 - 초안 개요 이슈 패치 & PR diff --git a/amethyst/src/main/res/values-lv-rLV/strings.xml b/amethyst/src/main/res/values-lv-rLV/strings.xml index e2799b1f3d..6be68eb7d4 100644 --- a/amethyst/src/main/res/values-lv-rLV/strings.xml +++ b/amethyst/src/main/res/values-lv-rLV/strings.xml @@ -2236,10 +2236,6 @@ Atvasināts no Tīmeklis: Klonēt: - Atvērts - Sapludināts - Slēgts - Melnraksts Pārskats Problēmas Ielāpi & PR diff --git a/amethyst/src/main/res/values-nl-rBE/strings.xml b/amethyst/src/main/res/values-nl-rBE/strings.xml index 73a20d22a4..3e218b02ce 100644 --- a/amethyst/src/main/res/values-nl-rBE/strings.xml +++ b/amethyst/src/main/res/values-nl-rBE/strings.xml @@ -3766,13 +3766,9 @@ Klonen: -Openen -Samengevoegd -Gesloten -Concept Overzicht diff --git a/amethyst/src/main/res/values-nl-rNL/strings.xml b/amethyst/src/main/res/values-nl-rNL/strings.xml index 18c0d9ede0..16a96b4dae 100644 --- a/amethyst/src/main/res/values-nl-rNL/strings.xml +++ b/amethyst/src/main/res/values-nl-rNL/strings.xml @@ -2486,10 +2486,6 @@ Commit Merge base De pull request bijgewerkt naar een nieuwe commit. - Openen - Samengevoegd - Gesloten - Concept Overzicht Problemen Patches & PRs diff --git a/amethyst/src/main/res/values-nl/strings.xml b/amethyst/src/main/res/values-nl/strings.xml index 2dc084b45a..5d58a78f70 100644 --- a/amethyst/src/main/res/values-nl/strings.xml +++ b/amethyst/src/main/res/values-nl/strings.xml @@ -3183,13 +3183,9 @@ Exporteren als ZIP (JSON) -Openen -Samengevoegd -Gesloten -Concept Overzicht diff --git a/amethyst/src/main/res/values-pl-rPL/strings.xml b/amethyst/src/main/res/values-pl-rPL/strings.xml index b6141b89f3..5a7354f0dd 100644 --- a/amethyst/src/main/res/values-pl-rPL/strings.xml +++ b/amethyst/src/main/res/values-pl-rPL/strings.xml @@ -3028,10 +3028,6 @@ Zaplanowane posty z innych kont nie zostaną opublikowane, dopóki to konto jest Commit Scal gałąź główną Zaktualizowano pull request, uwzględniając nowy commit. - Otwarte - Połączone - Zamknięte - Szkic Przegląd Problemy Łaty & PRs diff --git a/amethyst/src/main/res/values-pt-rBR/strings.xml b/amethyst/src/main/res/values-pt-rBR/strings.xml index 443dd37141..bb1e58c636 100644 --- a/amethyst/src/main/res/values-pt-rBR/strings.xml +++ b/amethyst/src/main/res/values-pt-rBR/strings.xml @@ -2943,10 +2943,6 @@ Commit Base de merge O pull request foi atualizado para um novo commit. - Aberto - Mesclado - Fechado - Rascunho Visão geral Tickets Patches e PRs diff --git a/amethyst/src/main/res/values-pt-rPT/strings.xml b/amethyst/src/main/res/values-pt-rPT/strings.xml index 339fc89011..afbea9652c 100644 --- a/amethyst/src/main/res/values-pt-rPT/strings.xml +++ b/amethyst/src/main/res/values-pt-rPT/strings.xml @@ -2195,10 +2195,6 @@ Forkado de Site: Clonar: - Aberto - Mesclado - Fechado - Rascunho Visão geral Tickets Patches e PRs diff --git a/amethyst/src/main/res/values-ru-rRU/strings.xml b/amethyst/src/main/res/values-ru-rRU/strings.xml index 8d4dcaf033..0a62663656 100644 --- a/amethyst/src/main/res/values-ru-rRU/strings.xml +++ b/amethyst/src/main/res/values-ru-rRU/strings.xml @@ -2271,10 +2271,6 @@ Форк от Веб: Клонировать: - Открыт - Объединён - Закрыт - Черновик Обзор Задачи Патчи и PR diff --git a/amethyst/src/main/res/values-ru-rUA/strings.xml b/amethyst/src/main/res/values-ru-rUA/strings.xml index 0dfa5f15ac..fcf1ab807d 100644 --- a/amethyst/src/main/res/values-ru-rUA/strings.xml +++ b/amethyst/src/main/res/values-ru-rUA/strings.xml @@ -2255,10 +2255,6 @@ Форк от Веб: Клонировать: - Открыт - Объединён - Закрыт - Черновик Обзор Задачи Патчи и PR diff --git a/amethyst/src/main/res/values-ru/strings.xml b/amethyst/src/main/res/values-ru/strings.xml index 5eaf42c364..ca347029c6 100644 --- a/amethyst/src/main/res/values-ru/strings.xml +++ b/amethyst/src/main/res/values-ru/strings.xml @@ -2556,13 +2556,9 @@ Клонировать: - Открыт - Объединён - Закрыт - Черновик Обзор diff --git a/amethyst/src/main/res/values-sl-rSI/strings.xml b/amethyst/src/main/res/values-sl-rSI/strings.xml index e9eda39911..1f1650424b 100644 --- a/amethyst/src/main/res/values-sl-rSI/strings.xml +++ b/amethyst/src/main/res/values-sl-rSI/strings.xml @@ -2729,10 +2729,6 @@ Za ohranitev zasebnosti to denarnico polni in prazni prek ne-zasebnih računov, Objavi Združi osnovo Zahtevek za združitev (PR) je bil posodobljen na novo objavo. - Odprto - Združeno - Zaključeno - Osnutek Predogled Težave Popravki in PR-ji diff --git a/amethyst/src/main/res/values-sr-rSP/strings.xml b/amethyst/src/main/res/values-sr-rSP/strings.xml index f858587513..1df33820b3 100644 --- a/amethyst/src/main/res/values-sr-rSP/strings.xml +++ b/amethyst/src/main/res/values-sr-rSP/strings.xml @@ -2226,10 +2226,6 @@ Ograničena pisanja Forkovan od Kloniraj: - Otvoreno - Spojeno - Zatvoreno - Nacrt Pregled Problemi Zakrpe & PR-ovi diff --git a/amethyst/src/main/res/values-sv-rSE/strings.xml b/amethyst/src/main/res/values-sv-rSE/strings.xml index 616679612e..f859fb4db5 100644 --- a/amethyst/src/main/res/values-sv-rSE/strings.xml +++ b/amethyst/src/main/res/values-sv-rSE/strings.xml @@ -2943,10 +2943,6 @@ Commit Mergebas Uppdaterade pull request till en ny commit. - Öppen - Sammanfogad - Stängd - Utkast Översikt Ärenden Patchar och PR diff --git a/amethyst/src/main/res/values-sw/strings.xml b/amethyst/src/main/res/values-sw/strings.xml index 23c89adb60..08a937498f 100644 --- a/amethyst/src/main/res/values-sw/strings.xml +++ b/amethyst/src/main/res/values-sw/strings.xml @@ -2213,10 +2213,6 @@ Imetoka kwenye Wavuti: Nakili: - Wazi - Imeunganishwa - Imefungwa - Rasimu Muhtasari Masuala Viraka & PRs diff --git a/amethyst/src/main/res/values-ta-rIN/strings.xml b/amethyst/src/main/res/values-ta-rIN/strings.xml index 0b0745ad44..c26b0d1706 100644 --- a/amethyst/src/main/res/values-ta-rIN/strings.xml +++ b/amethyst/src/main/res/values-ta-rIN/strings.xml @@ -2215,10 +2215,6 @@ இதிலிருந்து பிரிந்தது இணையம்: குளோன்: - திறந்த - இணைக்கப்பட்ட - மூடப்பட்ட - வரைவு மேலோட்டம் சிக்கல்கள் திட்டுகள் & PRs diff --git a/amethyst/src/main/res/values-ta/strings.xml b/amethyst/src/main/res/values-ta/strings.xml index bcc0f3b33c..e925434ffc 100644 --- a/amethyst/src/main/res/values-ta/strings.xml +++ b/amethyst/src/main/res/values-ta/strings.xml @@ -2105,10 +2105,6 @@ இதிலிருந்து பிரிந்தது இணையம்: குளோன்: -திறந்த -இணைக்கப்பட்ட -மூடப்பட்ட -வரைவு மேலோட்டம் சிக்கல்கள் திட்டுகள் & PRs diff --git a/amethyst/src/main/res/values-th-rTH/strings.xml b/amethyst/src/main/res/values-th-rTH/strings.xml index 0bd2ae7a0e..067bbff63c 100644 --- a/amethyst/src/main/res/values-th-rTH/strings.xml +++ b/amethyst/src/main/res/values-th-rTH/strings.xml @@ -2164,10 +2164,6 @@ คัดลอกมาจาก เว็บไซน์ สำเนา: - เปิด - ผสานแล้ว - ปิด - ร่าง ภาพรวม เกี่ยวกับ ลิงก์ diff --git a/amethyst/src/main/res/values-th/strings.xml b/amethyst/src/main/res/values-th/strings.xml index b2ffd57fbb..66c94e6356 100644 --- a/amethyst/src/main/res/values-th/strings.xml +++ b/amethyst/src/main/res/values-th/strings.xml @@ -2566,13 +2566,9 @@ ส่งออกเป็น ZIP (JSON) - เปิด - ผสานแล้ว - ปิด - ร่าง ภาพรวม diff --git a/amethyst/src/main/res/values-tr-rTR/strings.xml b/amethyst/src/main/res/values-tr-rTR/strings.xml index ee03a06c74..4528e30a8d 100644 --- a/amethyst/src/main/res/values-tr-rTR/strings.xml +++ b/amethyst/src/main/res/values-tr-rTR/strings.xml @@ -2221,10 +2221,6 @@ Kısıtlı Yazma Çatallandığı kaynak Klon: - Açık - Birleştirildi - Kapalı - Taslak Genel Bakış Sorunlar Yamalar & PR\'lar diff --git a/amethyst/src/main/res/values-tr/strings.xml b/amethyst/src/main/res/values-tr/strings.xml index d29471ab49..4fb2fbe90e 100644 --- a/amethyst/src/main/res/values-tr/strings.xml +++ b/amethyst/src/main/res/values-tr/strings.xml @@ -2956,13 +2956,9 @@ Klon: - Açık - Birleştirildi - Kapalı - Taslak Genel Bakış diff --git a/amethyst/src/main/res/values-uk-rUA/strings.xml b/amethyst/src/main/res/values-uk-rUA/strings.xml index 5c7b539058..3e4e8495b5 100644 --- a/amethyst/src/main/res/values-uk-rUA/strings.xml +++ b/amethyst/src/main/res/values-uk-rUA/strings.xml @@ -2274,10 +2274,6 @@ Форк від Веб: Клонувати: - Відкрито - Злито - Закрито - Чернетка Огляд Завдання Патчі та PR diff --git a/amethyst/src/main/res/values-uk/strings.xml b/amethyst/src/main/res/values-uk/strings.xml index 575badb8c8..c5eb8de526 100644 --- a/amethyst/src/main/res/values-uk/strings.xml +++ b/amethyst/src/main/res/values-uk/strings.xml @@ -2746,13 +2746,9 @@ Клонувати: - Відкрито - Злито - Закрито - Чернетка Огляд diff --git a/amethyst/src/main/res/values-uz-rUZ/strings.xml b/amethyst/src/main/res/values-uz-rUZ/strings.xml index 87b06ba05e..b77f179707 100644 --- a/amethyst/src/main/res/values-uz-rUZ/strings.xml +++ b/amethyst/src/main/res/values-uz-rUZ/strings.xml @@ -2218,10 +2218,6 @@ Ajratilgan Veb: Klonlash: - Ochiq - Birlashtirilgan - Yopiq - Qoralama Umumiy Ko\'rinish Muammolar Yamoqlar & PR lar diff --git a/amethyst/src/main/res/values-vi-rVN/strings.xml b/amethyst/src/main/res/values-vi-rVN/strings.xml index c0f532f719..278326e181 100644 --- a/amethyst/src/main/res/values-vi-rVN/strings.xml +++ b/amethyst/src/main/res/values-vi-rVN/strings.xml @@ -2175,10 +2175,6 @@ Cảm ơn bạn! Ghi Bị Hạn chế Được fork từ - Mở - Đã hợp nhất - Đã đóng - Nháp Tổng quan Giới thiệu Liên kết diff --git a/amethyst/src/main/res/values-zh-rCN/strings.xml b/amethyst/src/main/res/values-zh-rCN/strings.xml index 2b21124b7e..700d4f96e2 100644 --- a/amethyst/src/main/res/values-zh-rCN/strings.xml +++ b/amethyst/src/main/res/values-zh-rCN/strings.xml @@ -2822,10 +2822,6 @@ 提交 合并基 将拉取请求更新为新提交。 - 打开 - 已合并 - 已关闭 - 草稿 概述 议题 补丁 & PR diff --git a/amethyst/src/main/res/values-zh-rHK/strings.xml b/amethyst/src/main/res/values-zh-rHK/strings.xml index 553e326d25..bdac623cc1 100644 --- a/amethyst/src/main/res/values-zh-rHK/strings.xml +++ b/amethyst/src/main/res/values-zh-rHK/strings.xml @@ -2221,10 +2221,6 @@ Fork 來源 网址 克隆： - 打开 - 已合并 - 已关闭 - 草稿 概述 议题 补丁 & PR diff --git a/amethyst/src/main/res/values-zh-rSG/strings.xml b/amethyst/src/main/res/values-zh-rSG/strings.xml index b9ee15f15b..01f5ebdacd 100644 --- a/amethyst/src/main/res/values-zh-rSG/strings.xml +++ b/amethyst/src/main/res/values-zh-rSG/strings.xml @@ -2221,10 +2221,6 @@ Fork 來源 网址 克隆： - 打开 - 已合并 - 已关闭 - 草稿 概述 议题 补丁 & PR diff --git a/amethyst/src/main/res/values-zh-rTW/strings.xml b/amethyst/src/main/res/values-zh-rTW/strings.xml index 8de65bc350..ebb565d297 100644 --- a/amethyst/src/main/res/values-zh-rTW/strings.xml +++ b/amethyst/src/main/res/values-zh-rTW/strings.xml @@ -2198,10 +2198,6 @@ 分叉自 網址 克隆： - 開放 - 已合併 - 已關閉 - 草稿 概覽 議題 修補程式與 PR diff --git a/amethyst/src/main/res/values-zh/strings.xml b/amethyst/src/main/res/values-zh/strings.xml index b9f3309a64..f066007832 100644 --- a/amethyst/src/main/res/values-zh/strings.xml +++ b/amethyst/src/main/res/values-zh/strings.xml @@ -4174,13 +4174,9 @@ 克隆： -打开 -已合并 -已关闭 -草稿 概述 diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml index c4e62ddfd8..3e18eeec62 100644 --- a/amethyst/src/main/res/values/strings.xml +++ b/amethyst/src/main/res/values/strings.xml @@ -3265,10 +3265,6 @@ Commit Merge base Updated the pull request to a new commit. - Open - Merged - Closed - Draft Overview Issues Patches & PRs diff --git a/commons/src/commonMain/composeResources/values-ar-rSA/strings.xml b/commons/src/commonMain/composeResources/values-ar-rSA/strings.xml new file mode 100644 index 0000000000..d80ea2de82 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-ar-rSA/strings.xml @@ -0,0 +1,7 @@ + + + مفتوح + مدمج + مغلق + مسودة + diff --git a/commons/src/commonMain/composeResources/values-bn-rBD/strings.xml b/commons/src/commonMain/composeResources/values-bn-rBD/strings.xml new file mode 100644 index 0000000000..849203b83f --- /dev/null +++ b/commons/src/commonMain/composeResources/values-bn-rBD/strings.xml @@ -0,0 +1,7 @@ + + + খোলা + মার্জ করা হয়েছে + বন্ধ + ড্রাফট + diff --git a/commons/src/commonMain/composeResources/values-cs/strings.xml b/commons/src/commonMain/composeResources/values-cs/strings.xml new file mode 100644 index 0000000000..b690a79c15 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-cs/strings.xml @@ -0,0 +1,7 @@ + + + Otevřeno + Sloučeno + Uzavřeno + Koncept + diff --git a/commons/src/commonMain/composeResources/values-de-rDE/strings.xml b/commons/src/commonMain/composeResources/values-de-rDE/strings.xml new file mode 100644 index 0000000000..b0cb49c7fe --- /dev/null +++ b/commons/src/commonMain/composeResources/values-de-rDE/strings.xml @@ -0,0 +1,7 @@ + + + Offen + Zusammengeführt + Geschlossen + Entwurf + diff --git a/commons/src/commonMain/composeResources/values-de/strings.xml b/commons/src/commonMain/composeResources/values-de/strings.xml new file mode 100644 index 0000000000..b0cb49c7fe --- /dev/null +++ b/commons/src/commonMain/composeResources/values-de/strings.xml @@ -0,0 +1,7 @@ + + + Offen + Zusammengeführt + Geschlossen + Entwurf + diff --git a/commons/src/commonMain/composeResources/values-el-rGR/strings.xml b/commons/src/commonMain/composeResources/values-el-rGR/strings.xml new file mode 100644 index 0000000000..36a988d85e --- /dev/null +++ b/commons/src/commonMain/composeResources/values-el-rGR/strings.xml @@ -0,0 +1,7 @@ + + + Ανοιχτό + Συγχωνευμένο + Κλειστό + Πρόχειρο + diff --git a/commons/src/commonMain/composeResources/values-eo-rUY/strings.xml b/commons/src/commonMain/composeResources/values-eo-rUY/strings.xml new file mode 100644 index 0000000000..88e735147f --- /dev/null +++ b/commons/src/commonMain/composeResources/values-eo-rUY/strings.xml @@ -0,0 +1,7 @@ + + + Malferma + Kunfandita + Fermita + Malneto + diff --git a/commons/src/commonMain/composeResources/values-eo/strings.xml b/commons/src/commonMain/composeResources/values-eo/strings.xml new file mode 100644 index 0000000000..88e735147f --- /dev/null +++ b/commons/src/commonMain/composeResources/values-eo/strings.xml @@ -0,0 +1,7 @@ + + + Malferma + Kunfandita + Fermita + Malneto + diff --git a/commons/src/commonMain/composeResources/values-es-rES/strings.xml b/commons/src/commonMain/composeResources/values-es-rES/strings.xml new file mode 100644 index 0000000000..e25c34e1f3 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-es-rES/strings.xml @@ -0,0 +1,7 @@ + + + Abierto + Fusionado + Cerrado + Borrador + diff --git a/commons/src/commonMain/composeResources/values-es-rMX/strings.xml b/commons/src/commonMain/composeResources/values-es-rMX/strings.xml new file mode 100644 index 0000000000..e25c34e1f3 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-es-rMX/strings.xml @@ -0,0 +1,7 @@ + + + Abierto + Fusionado + Cerrado + Borrador + diff --git a/commons/src/commonMain/composeResources/values-es-rUS/strings.xml b/commons/src/commonMain/composeResources/values-es-rUS/strings.xml new file mode 100644 index 0000000000..e25c34e1f3 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-es-rUS/strings.xml @@ -0,0 +1,7 @@ + + + Abierto + Fusionado + Cerrado + Borrador + diff --git a/commons/src/commonMain/composeResources/values-es/strings.xml b/commons/src/commonMain/composeResources/values-es/strings.xml new file mode 100644 index 0000000000..e25c34e1f3 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-es/strings.xml @@ -0,0 +1,7 @@ + + + Abierto + Fusionado + Cerrado + Borrador + diff --git a/commons/src/commonMain/composeResources/values-fa-rIR/strings.xml b/commons/src/commonMain/composeResources/values-fa-rIR/strings.xml new file mode 100644 index 0000000000..660ab2a9d7 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-fa-rIR/strings.xml @@ -0,0 +1,7 @@ + + + باز + ادغام شده + بسته + پیش‌نویس + diff --git a/commons/src/commonMain/composeResources/values-fa/strings.xml b/commons/src/commonMain/composeResources/values-fa/strings.xml new file mode 100644 index 0000000000..660ab2a9d7 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-fa/strings.xml @@ -0,0 +1,7 @@ + + + باز + ادغام شده + بسته + پیش‌نویس + diff --git a/commons/src/commonMain/composeResources/values-fi-rFI/strings.xml b/commons/src/commonMain/composeResources/values-fi-rFI/strings.xml new file mode 100644 index 0000000000..87d641593c --- /dev/null +++ b/commons/src/commonMain/composeResources/values-fi-rFI/strings.xml @@ -0,0 +1,7 @@ + + + Avoin + Yhdistetty + Suljettu + Luonnos + diff --git a/commons/src/commonMain/composeResources/values-fr-rCA/strings.xml b/commons/src/commonMain/composeResources/values-fr-rCA/strings.xml new file mode 100644 index 0000000000..101c73c43e --- /dev/null +++ b/commons/src/commonMain/composeResources/values-fr-rCA/strings.xml @@ -0,0 +1,7 @@ + + + Ouvert + Fusionné + Fermé + Brouillon + diff --git a/commons/src/commonMain/composeResources/values-fr-rFR/strings.xml b/commons/src/commonMain/composeResources/values-fr-rFR/strings.xml new file mode 100644 index 0000000000..101c73c43e --- /dev/null +++ b/commons/src/commonMain/composeResources/values-fr-rFR/strings.xml @@ -0,0 +1,7 @@ + + + Ouvert + Fusionné + Fermé + Brouillon + diff --git a/commons/src/commonMain/composeResources/values-fr/strings.xml b/commons/src/commonMain/composeResources/values-fr/strings.xml new file mode 100644 index 0000000000..101c73c43e --- /dev/null +++ b/commons/src/commonMain/composeResources/values-fr/strings.xml @@ -0,0 +1,7 @@ + + + Ouvert + Fusionné + Fermé + Brouillon + diff --git a/commons/src/commonMain/composeResources/values-hi-rIN/strings.xml b/commons/src/commonMain/composeResources/values-hi-rIN/strings.xml new file mode 100644 index 0000000000..db6c5211be --- /dev/null +++ b/commons/src/commonMain/composeResources/values-hi-rIN/strings.xml @@ -0,0 +1,7 @@ + + + खुला + विलीन + आवृत + पाण्डुलिपि + diff --git a/commons/src/commonMain/composeResources/values-hu-rHU/strings.xml b/commons/src/commonMain/composeResources/values-hu-rHU/strings.xml new file mode 100644 index 0000000000..b11e462ab6 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-hu-rHU/strings.xml @@ -0,0 +1,7 @@ + + + Nyitva + Beolvasztva + Lezárva + Vázlat + diff --git a/commons/src/commonMain/composeResources/values-in-rID/strings.xml b/commons/src/commonMain/composeResources/values-in-rID/strings.xml new file mode 100644 index 0000000000..1b36915807 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-in-rID/strings.xml @@ -0,0 +1,6 @@ + + + Terbuka + Digabungkan + Ditutup + diff --git a/commons/src/commonMain/composeResources/values-in/strings.xml b/commons/src/commonMain/composeResources/values-in/strings.xml new file mode 100644 index 0000000000..9ee3f92f6e --- /dev/null +++ b/commons/src/commonMain/composeResources/values-in/strings.xml @@ -0,0 +1,7 @@ + + + Terbuka + Digabungkan + Ditutup + Draft + diff --git a/commons/src/commonMain/composeResources/values-it-rIT/strings.xml b/commons/src/commonMain/composeResources/values-it-rIT/strings.xml new file mode 100644 index 0000000000..ccc3eb9755 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-it-rIT/strings.xml @@ -0,0 +1,7 @@ + + + Aperto + Unito + Chiuso + Bozza + diff --git a/commons/src/commonMain/composeResources/values-ja-rJP/strings.xml b/commons/src/commonMain/composeResources/values-ja-rJP/strings.xml new file mode 100644 index 0000000000..cdfa2c9ad5 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-ja-rJP/strings.xml @@ -0,0 +1,7 @@ + + + オープン + マージ済み + クローズ済み + 下書き + diff --git a/commons/src/commonMain/composeResources/values-ja/strings.xml b/commons/src/commonMain/composeResources/values-ja/strings.xml new file mode 100644 index 0000000000..cdfa2c9ad5 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-ja/strings.xml @@ -0,0 +1,7 @@ + + + オープン + マージ済み + クローズ済み + 下書き + diff --git a/commons/src/commonMain/composeResources/values-ko-rKR/strings.xml b/commons/src/commonMain/composeResources/values-ko-rKR/strings.xml new file mode 100644 index 0000000000..6046412e40 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-ko-rKR/strings.xml @@ -0,0 +1,7 @@ + + + 열림 + 병합됨 + 닫힘 + 초안 + diff --git a/commons/src/commonMain/composeResources/values-lv-rLV/strings.xml b/commons/src/commonMain/composeResources/values-lv-rLV/strings.xml new file mode 100644 index 0000000000..a5d95bf7de --- /dev/null +++ b/commons/src/commonMain/composeResources/values-lv-rLV/strings.xml @@ -0,0 +1,7 @@ + + + Atvērts + Sapludināts + Slēgts + Melnraksts + diff --git a/commons/src/commonMain/composeResources/values-nl-rBE/strings.xml b/commons/src/commonMain/composeResources/values-nl-rBE/strings.xml new file mode 100644 index 0000000000..ca95a6505b --- /dev/null +++ b/commons/src/commonMain/composeResources/values-nl-rBE/strings.xml @@ -0,0 +1,7 @@ + + + Openen + Samengevoegd + Gesloten + Concept + diff --git a/commons/src/commonMain/composeResources/values-nl-rNL/strings.xml b/commons/src/commonMain/composeResources/values-nl-rNL/strings.xml new file mode 100644 index 0000000000..ca95a6505b --- /dev/null +++ b/commons/src/commonMain/composeResources/values-nl-rNL/strings.xml @@ -0,0 +1,7 @@ + + + Openen + Samengevoegd + Gesloten + Concept + diff --git a/commons/src/commonMain/composeResources/values-nl/strings.xml b/commons/src/commonMain/composeResources/values-nl/strings.xml new file mode 100644 index 0000000000..ca95a6505b --- /dev/null +++ b/commons/src/commonMain/composeResources/values-nl/strings.xml @@ -0,0 +1,7 @@ + + + Openen + Samengevoegd + Gesloten + Concept + diff --git a/commons/src/commonMain/composeResources/values-pl-rPL/strings.xml b/commons/src/commonMain/composeResources/values-pl-rPL/strings.xml new file mode 100644 index 0000000000..d1ea195c45 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-pl-rPL/strings.xml @@ -0,0 +1,7 @@ + + + Otwarte + Połączone + Zamknięte + Szkic + diff --git a/commons/src/commonMain/composeResources/values-pt-rBR/strings.xml b/commons/src/commonMain/composeResources/values-pt-rBR/strings.xml new file mode 100644 index 0000000000..b96ac87c78 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-pt-rBR/strings.xml @@ -0,0 +1,7 @@ + + + Aberto + Mesclado + Fechado + Rascunho + diff --git a/commons/src/commonMain/composeResources/values-pt-rPT/strings.xml b/commons/src/commonMain/composeResources/values-pt-rPT/strings.xml new file mode 100644 index 0000000000..b96ac87c78 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-pt-rPT/strings.xml @@ -0,0 +1,7 @@ + + + Aberto + Mesclado + Fechado + Rascunho + diff --git a/commons/src/commonMain/composeResources/values-ru-rRU/strings.xml b/commons/src/commonMain/composeResources/values-ru-rRU/strings.xml new file mode 100644 index 0000000000..b5e1deb4c5 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-ru-rRU/strings.xml @@ -0,0 +1,7 @@ + + + Открыт + Объединён + Закрыт + Черновик + diff --git a/commons/src/commonMain/composeResources/values-ru-rUA/strings.xml b/commons/src/commonMain/composeResources/values-ru-rUA/strings.xml new file mode 100644 index 0000000000..b5e1deb4c5 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-ru-rUA/strings.xml @@ -0,0 +1,7 @@ + + + Открыт + Объединён + Закрыт + Черновик + diff --git a/commons/src/commonMain/composeResources/values-ru/strings.xml b/commons/src/commonMain/composeResources/values-ru/strings.xml new file mode 100644 index 0000000000..b5e1deb4c5 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-ru/strings.xml @@ -0,0 +1,7 @@ + + + Открыт + Объединён + Закрыт + Черновик + diff --git a/commons/src/commonMain/composeResources/values-sl-rSI/strings.xml b/commons/src/commonMain/composeResources/values-sl-rSI/strings.xml new file mode 100644 index 0000000000..d20fe94c47 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-sl-rSI/strings.xml @@ -0,0 +1,7 @@ + + + Odprto + Združeno + Zaključeno + Osnutek + diff --git a/commons/src/commonMain/composeResources/values-sr-rSP/strings.xml b/commons/src/commonMain/composeResources/values-sr-rSP/strings.xml new file mode 100644 index 0000000000..8c74c4df01 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-sr-rSP/strings.xml @@ -0,0 +1,7 @@ + + + Otvoreno + Spojeno + Zatvoreno + Nacrt + diff --git a/commons/src/commonMain/composeResources/values-sv-rSE/strings.xml b/commons/src/commonMain/composeResources/values-sv-rSE/strings.xml new file mode 100644 index 0000000000..a67d5eaf3e --- /dev/null +++ b/commons/src/commonMain/composeResources/values-sv-rSE/strings.xml @@ -0,0 +1,7 @@ + + + Öppen + Sammanfogad + Stängd + Utkast + diff --git a/commons/src/commonMain/composeResources/values-sw/strings.xml b/commons/src/commonMain/composeResources/values-sw/strings.xml new file mode 100644 index 0000000000..5e13e7da00 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-sw/strings.xml @@ -0,0 +1,7 @@ + + + Wazi + Imeunganishwa + Imefungwa + Rasimu + diff --git a/commons/src/commonMain/composeResources/values-ta-rIN/strings.xml b/commons/src/commonMain/composeResources/values-ta-rIN/strings.xml new file mode 100644 index 0000000000..3231502436 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-ta-rIN/strings.xml @@ -0,0 +1,7 @@ + + + திறந்த + இணைக்கப்பட்ட + மூடப்பட்ட + வரைவு + diff --git a/commons/src/commonMain/composeResources/values-ta/strings.xml b/commons/src/commonMain/composeResources/values-ta/strings.xml new file mode 100644 index 0000000000..3231502436 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-ta/strings.xml @@ -0,0 +1,7 @@ + + + திறந்த + இணைக்கப்பட்ட + மூடப்பட்ட + வரைவு + diff --git a/commons/src/commonMain/composeResources/values-th-rTH/strings.xml b/commons/src/commonMain/composeResources/values-th-rTH/strings.xml new file mode 100644 index 0000000000..5091d03b13 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-th-rTH/strings.xml @@ -0,0 +1,7 @@ + + + เปิด + ผสานแล้ว + ปิด + ร่าง + diff --git a/commons/src/commonMain/composeResources/values-th/strings.xml b/commons/src/commonMain/composeResources/values-th/strings.xml new file mode 100644 index 0000000000..5091d03b13 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-th/strings.xml @@ -0,0 +1,7 @@ + + + เปิด + ผสานแล้ว + ปิด + ร่าง + diff --git a/commons/src/commonMain/composeResources/values-tr-rTR/strings.xml b/commons/src/commonMain/composeResources/values-tr-rTR/strings.xml new file mode 100644 index 0000000000..6128b40b6b --- /dev/null +++ b/commons/src/commonMain/composeResources/values-tr-rTR/strings.xml @@ -0,0 +1,7 @@ + + + Açık + Birleştirildi + Kapalı + Taslak + diff --git a/commons/src/commonMain/composeResources/values-tr/strings.xml b/commons/src/commonMain/composeResources/values-tr/strings.xml new file mode 100644 index 0000000000..6128b40b6b --- /dev/null +++ b/commons/src/commonMain/composeResources/values-tr/strings.xml @@ -0,0 +1,7 @@ + + + Açık + Birleştirildi + Kapalı + Taslak + diff --git a/commons/src/commonMain/composeResources/values-uk-rUA/strings.xml b/commons/src/commonMain/composeResources/values-uk-rUA/strings.xml new file mode 100644 index 0000000000..0823c5228c --- /dev/null +++ b/commons/src/commonMain/composeResources/values-uk-rUA/strings.xml @@ -0,0 +1,7 @@ + + + Відкрито + Злито + Закрито + Чернетка + diff --git a/commons/src/commonMain/composeResources/values-uk/strings.xml b/commons/src/commonMain/composeResources/values-uk/strings.xml new file mode 100644 index 0000000000..0823c5228c --- /dev/null +++ b/commons/src/commonMain/composeResources/values-uk/strings.xml @@ -0,0 +1,7 @@ + + + Відкрито + Злито + Закрито + Чернетка + diff --git a/commons/src/commonMain/composeResources/values-uz-rUZ/strings.xml b/commons/src/commonMain/composeResources/values-uz-rUZ/strings.xml new file mode 100644 index 0000000000..3df95765ab --- /dev/null +++ b/commons/src/commonMain/composeResources/values-uz-rUZ/strings.xml @@ -0,0 +1,7 @@ + + + Ochiq + Birlashtirilgan + Yopiq + Qoralama + diff --git a/commons/src/commonMain/composeResources/values-vi-rVN/strings.xml b/commons/src/commonMain/composeResources/values-vi-rVN/strings.xml new file mode 100644 index 0000000000..62dec03f44 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-vi-rVN/strings.xml @@ -0,0 +1,7 @@ + + + Mở + Đã hợp nhất + Đã đóng + Nháp + diff --git a/commons/src/commonMain/composeResources/values-zh-rCN/strings.xml b/commons/src/commonMain/composeResources/values-zh-rCN/strings.xml new file mode 100644 index 0000000000..99aa70ec8b --- /dev/null +++ b/commons/src/commonMain/composeResources/values-zh-rCN/strings.xml @@ -0,0 +1,7 @@ + + + 打开 + 已合并 + 已关闭 + 草稿 + diff --git a/commons/src/commonMain/composeResources/values-zh-rHK/strings.xml b/commons/src/commonMain/composeResources/values-zh-rHK/strings.xml new file mode 100644 index 0000000000..99aa70ec8b --- /dev/null +++ b/commons/src/commonMain/composeResources/values-zh-rHK/strings.xml @@ -0,0 +1,7 @@ + + + 打开 + 已合并 + 已关闭 + 草稿 + diff --git a/commons/src/commonMain/composeResources/values-zh-rSG/strings.xml b/commons/src/commonMain/composeResources/values-zh-rSG/strings.xml new file mode 100644 index 0000000000..99aa70ec8b --- /dev/null +++ b/commons/src/commonMain/composeResources/values-zh-rSG/strings.xml @@ -0,0 +1,7 @@ + + + 打开 + 已合并 + 已关闭 + 草稿 + diff --git a/commons/src/commonMain/composeResources/values-zh-rTW/strings.xml b/commons/src/commonMain/composeResources/values-zh-rTW/strings.xml new file mode 100644 index 0000000000..9afbc81bb3 --- /dev/null +++ b/commons/src/commonMain/composeResources/values-zh-rTW/strings.xml @@ -0,0 +1,7 @@ + + + 開放 + 已合併 + 已關閉 + 草稿 + diff --git a/commons/src/commonMain/composeResources/values-zh/strings.xml b/commons/src/commonMain/composeResources/values-zh/strings.xml new file mode 100644 index 0000000000..99aa70ec8b --- /dev/null +++ b/commons/src/commonMain/composeResources/values-zh/strings.xml @@ -0,0 +1,7 @@ + + + 打开 + 已合并 + 已关闭 + 草稿 + diff --git a/commons/src/commonMain/composeResources/values/strings.xml b/commons/src/commonMain/composeResources/values/strings.xml index e50c831382..83a2053295 100644 --- a/commons/src/commonMain/composeResources/values/strings.xml +++ b/commons/src/commonMain/composeResources/values/strings.xml @@ -101,4 +101,8 @@ Private note about this user Save Cancel + Open + Merged + Closed + Draft diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/note/GitStatusPill.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/note/GitStatusPill.kt new file mode 100644 index 0000000000..5ad02ef4bf --- /dev/null +++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/note/GitStatusPill.kt @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2025 Vitor Pamplona + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the + * Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +package com.vitorpamplona.amethyst.commons.ui.note + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import com.vitorpamplona.amethyst.commons.icons.symbols.Icon +import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbol +import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols +import com.vitorpamplona.amethyst.commons.resources.Res +import com.vitorpamplona.amethyst.commons.resources.git_status_closed +import com.vitorpamplona.amethyst.commons.resources.git_status_draft +import com.vitorpamplona.amethyst.commons.resources.git_status_merged +import com.vitorpamplona.amethyst.commons.resources.git_status_open +import org.jetbrains.compose.resources.stringResource + +private val PillShape = RoundedCornerShape(8.dp) + +/** The four NIP-34 patch/issue lifecycle states a [GitStatusPill] can render. */ +enum class StatusKind { + OPEN, + APPLIED, + CLOSED, + DRAFT, +} + +/** + * A small colored pill for a NIP-34 git patch/issue status, styled after GitHub's + * state badges. Pure presentation: the caller decides which [kind] to show (the + * Android entry resolves it from the status index). Shared by Android and Desktop. + */ +@Composable +fun GitStatusPill( + kind: StatusKind, + modifier: Modifier = Modifier, +) { + val (label, symbol, container, content) = + when (kind) { + StatusKind.OPEN -> { + StatusStyle( + label = stringResource(Res.string.git_status_open), + symbol = MaterialSymbols.RadioButtonChecked, + container = Color(0xFF1F883D), + content = Color.White, + ) + } + + StatusKind.APPLIED -> { + StatusStyle( + label = stringResource(Res.string.git_status_merged), + symbol = MaterialSymbols.Check, + container = Color(0xFF8250DF), + content = Color.White, + ) + } + + StatusKind.CLOSED -> { + StatusStyle( + label = stringResource(Res.string.git_status_closed), + symbol = MaterialSymbols.Cancel, + container = Color(0xFFCF222E), + content = Color.White, + ) + } + + StatusKind.DRAFT -> { + StatusStyle( + label = stringResource(Res.string.git_status_draft), + symbol = MaterialSymbols.EditNote, + container = MaterialTheme.colorScheme.surfaceVariant, + content = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + + Row( + modifier = + modifier + .clip(PillShape) + .background(container) + .padding(horizontal = 8.dp, vertical = 2.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(4.dp), + ) { + Icon( + symbol = symbol, + contentDescription = null, + modifier = Modifier.size(12.dp), + tint = content, + ) + Text( + text = label, + style = MaterialTheme.typography.labelSmall, + fontWeight = FontWeight.SemiBold, + color = content, + ) + } +} + +private data class StatusStyle( + val label: String, + val symbol: MaterialSymbol, + val container: Color, + val content: Color, +) diff --git a/crowdin.yml b/crowdin.yml index 0a0593d16d..f2aae05f9d 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -24,5 +24,18 @@ files: # Czech: single target, but Crowdin's default android_code is cs-rCZ, so # without this it writes values-cs-rCZ instead of base values-cs. Single # target => no collision; cs-CZ is dropped from locales_config to match. + cs: cs + sw-KE: sw + + # Shared UI strings that have been pulled down from the Android app into + # commons (Compose Multiplatform resources, consumed by amethyst + desktopApp). + # Same android layout + language mapping as the amethyst source so a key reads + # identically whichever module owns it after the note-ui-commons extraction. + - source: commons/src/commonMain/composeResources/values/strings.xml + translation: commons/src/commonMain/composeResources/values-%android_code%/%original_file_name% + type: android + skip_untranslated_strings: true + languages_mapping: + android_code: cs: cs sw-KE: sw \ No newline at end of file