Skip to content

Commit 0bab763

Browse files
gdlbogdlbo
committed
feat(settings): show api layer
1 parent d8372d1 commit 0bab763

20 files changed

Lines changed: 70 additions & 9 deletions

File tree

‎feature/settings/src/main/java/org/monogram/feature/settings/SettingsStore.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ interface SettingsStore : Store<SettingsStore.Intent, SettingsStore.State, Setti
4444
val appVersion: String,
4545
val buildStamp: String,
4646
val nativeVersion: String,
47+
val apiLayer: Int = 0,
4748
val cacheBytes: Long = 0L,
4849
val cacheByKind: Map<String, Long> = emptyMap(),
4950
val cacheChats: List<CacheChatRow> = emptyList(),
@@ -81,6 +82,7 @@ internal class SettingsStoreFactory(
8182
appVersion = appVersion,
8283
buildStamp = buildStamp,
8384
nativeVersion = client.libraryVersion(),
85+
apiLayer = client.apiLayer(),
8486
cacheBytes = mediaRepository?.cacheSizeBytes() ?: 0L,
8587
),
8688
bootstrapper = SimpleBootstrapper(Unit),
@@ -98,6 +100,7 @@ internal class SettingsStoreFactory(
98100
data class CacheMessage(val value: String?) : Msg
99101
data class Error(val value: TelegramError?) : Msg
100102
data class NativeVersion(val value: String) : Msg
103+
data class ApiLayer(val value: Int) : Msg
101104
data class DebugExportMessage(val value: String?) : Msg
102105
}
103106

@@ -133,6 +136,7 @@ internal class SettingsStoreFactory(
133136
private fun refresh() {
134137
dispatch(Msg.Error(null))
135138
dispatch(Msg.NativeVersion(client.libraryVersion()))
139+
dispatch(Msg.ApiLayer(client.apiLayer()))
136140
refreshCache()
137141
scope.launch {
138142
val cachedId = sessionStore?.readAuthorizedUserId()?.value
@@ -241,6 +245,7 @@ internal class SettingsStoreFactory(
241245
is Msg.CacheMessage -> copy(cacheMessage = msg.value)
242246
is Msg.Error -> copy(error = msg.value)
243247
is Msg.NativeVersion -> copy(nativeVersion = msg.value)
248+
is Msg.ApiLayer -> copy(apiLayer = msg.value)
244249
is Msg.DebugExportMessage -> copy(debugExportMessage = msg.value)
245250
}
246251
}

‎feature/settings/src/main/java/org/monogram/feature/settings/ui/SettingsContent.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ fun SettingsContent(
382382
devicesSubtitle = activeDeviceCount.sessions
383383
.count { !it.current && !it.passwordPending }
384384
.takeIf { it > 0 },
385+
apiLayer = state.apiLayer,
385386
)
386387
}
387388

‎feature/settings/src/main/java/org/monogram/feature/settings/ui/SettingsHome.kt‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ internal fun LazyListScope.homeItems(
6868
updateState: AppUpdateState = AppUpdateState.Idle,
6969
updatesEnabled: Boolean = true,
7070
devicesSubtitle: Int? = null,
71+
apiLayer: Int = 0,
7172
) {
7273
item {
7374
AccountHeader(
@@ -303,8 +304,19 @@ internal fun LazyListScope.homeItems(
303304
)
304305
}
305306
item {
307+
val about = buildString {
308+
append(stringResource(R.string.settings_about))
309+
append(' ')
310+
append(appVersion)
311+
append('\n')
312+
append(buildStamp)
313+
if (apiLayer > 0) {
314+
append('\n')
315+
append(stringResource(R.string.settings_api_layer, apiLayer))
316+
}
317+
}
306318
Text(
307-
text = "${stringResource(R.string.settings_about)} $appVersion\n$buildStamp",
319+
text = about,
308320
style = MaterialTheme.typography.bodySmall,
309321
color = MaterialTheme.colorScheme.onSurfaceVariant,
310322
modifier = Modifier

‎feature/settings/src/main/res/values-es/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@
273273
<string name="settings_input_bar_fix_previews">Corregir vistas previas de enlaces</string>
274274
<string name="settings_input_bar_fix_previews_sub">Corregir vistas previas de enlaces para X, Bluesky, TikTok, Reddit y Pixiv</string>
275275
<string name="settings_about">Monogram</string>
276+
<string name="settings_api_layer">Capa de API %1$d</string>
276277
<string name="settings_update_beta">Actualizaciones beta</string>
277278
<string name="settings_update_beta_sub">Instalar compilaciones de CI desde GitHub Actions</string>
278279
<string name="settings_update_beta_supporters">La descarga automática de GitHub Actions está disponible solo para patrocinadores</string>

‎feature/settings/src/main/res/values-hy/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@
273273
<string name="settings_input_bar_fix_previews">Հղումների նախադիտման ուղղում</string>
274274
<string name="settings_input_bar_fix_previews_sub">Ուղղել հղումների նախադիտումները X-ի, Bluesky-ի, TikTok-ի, Reddit-ի և Pixiv-ի համար</string>
275275
<string name="settings_about">Monogram</string>
276+
<string name="settings_api_layer">API շերտ %1$d</string>
276277
<string name="settings_update_beta">Բետա թարմացումներ</string>
277278
<string name="settings_update_beta_sub">Տեղադրել CI տարբերակներ GitHub Actions-ից</string>
278279
<string name="settings_update_beta_supporters">GitHub Actions-ի ավտոմատ ներբեռնումները հասանելի են միայն աջակիցներին</string>

‎feature/settings/src/main/res/values-ja/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@
273273
<string name="settings_input_bar_fix_previews">リンクのプレビュー修正</string>
274274
<string name="settings_input_bar_fix_previews_sub">X、Bluesky、TikTok、Reddit、Pixivのリンクプレビューを修正</string>
275275
<string name="settings_about">Monogram</string>
276+
<string name="settings_api_layer">APIレイヤー %1$d</string>
276277
<string name="settings_update_beta">ベータ版アップデート</string>
277278
<string name="settings_update_beta_sub">GitHub Actions から CI ビルドをインストール</string>
278279
<string name="settings_update_beta_supporters">GitHub Actions ビルドの自動ダウンロードはサポーター限定です</string>

‎feature/settings/src/main/res/values-pt-rBR/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@
273273
<string name="settings_input_bar_fix_previews">Corrigir prévias de links</string>
274274
<string name="settings_input_bar_fix_previews_sub">Corrigir prévias de links para X, Bluesky, TikTok, Reddit e Pixiv</string>
275275
<string name="settings_about">Monogram</string>
276+
<string name="settings_api_layer">Camada de API %1$d</string>
276277
<string name="settings_update_beta">Atualizações beta</string>
277278
<string name="settings_update_beta_sub">Instalar compilações de CI do GitHub Actions</string>
278279
<string name="settings_update_beta_supporters">O download automático do GitHub Actions está disponível apenas para apoiadores</string>

‎feature/settings/src/main/res/values-ru/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@
273273
<string name="settings_input_bar_fix_previews">Исправление предпросмотра ссылок</string>
274274
<string name="settings_input_bar_fix_previews_sub">Исправлять превью ссылок для X, Bluesky, TikTok, Reddit и Pixiv</string>
275275
<string name="settings_about">Monogram</string>
276+
<string name="settings_api_layer">Слой API %1$d</string>
276277
<string name="settings_update_beta">Бета-обновления</string>
277278
<string name="settings_update_beta_sub">Устанавливать сборки CI из GitHub Actions</string>
278279
<string name="settings_update_beta_supporters">Автоматическая загрузка сборок GitHub Actions доступна только спонсорам</string>

‎feature/settings/src/main/res/values-sk/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@
273273
<string name="settings_input_bar_fix_previews">Oprava náhľadov odkazov</string>
274274
<string name="settings_input_bar_fix_previews_sub">Opravovať náhľady odkazov pre X, Bluesky, TikTok, Reddit a Pixiv</string>
275275
<string name="settings_about">Monogram</string>
276+
<string name="settings_api_layer">Vrstva API %1$d</string>
276277
<string name="settings_update_beta">Beta aktualizácie</string>
277278
<string name="settings_update_beta_sub">Inštalovať CI zostavy z GitHub Actions</string>
278279
<string name="settings_update_beta_supporters">Automatické sťahovanie zostáv z GitHub Actions je dostupné len pre podporovateľov</string>

‎feature/settings/src/main/res/values-tr/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@
273273
<string name="settings_input_bar_fix_previews">Bağlantı önizlemelerini düzelt</string>
274274
<string name="settings_input_bar_fix_previews_sub">X, Bluesky, TikTok, Reddit ve Pixiv için bağlantı önizlemelerini düzelt</string>
275275
<string name="settings_about">Monogram</string>
276+
<string name="settings_api_layer">API katmanı %1$d</string>
276277
<string name="settings_update_beta">Beta güncellemeleri</string>
277278
<string name="settings_update_beta_sub">GitHub Actions üzerinden CI sürümlerini yükle</string>
278279
<string name="settings_update_beta_supporters">GitHub Actions derlemelerinin otomatik indirilmesi yalnızca destekçilere açıktır</string>

0 commit comments

Comments
 (0)