From 31434fcb70261749ef1818d5c2e27e2860b159f9 Mon Sep 17 00:00:00 2001 From: Infi Date: Sat, 9 Dec 2023 22:29:15 +0100 Subject: [PATCH] fix: issue where changelogs are opposite the sensical order Signed-off-by: Infi --- .../main/java/chat/revolt/internals/Changelogs.kt | 4 ++++ .../chat/revolt/screens/settings/ChangelogsScreen.kt | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/chat/revolt/internals/Changelogs.kt b/app/src/main/java/chat/revolt/internals/Changelogs.kt index eac0b8b3..44e7068a 100644 --- a/app/src/main/java/chat/revolt/internals/Changelogs.kt +++ b/app/src/main/java/chat/revolt/internals/Changelogs.kt @@ -25,6 +25,10 @@ class Changelogs(val context: Context, val kvStorage: KVStorage? = null) { RevoltJson.decodeFromString(ChangelogIndex.serializer(), it) } + fun getList(): Map { + return index.list.entries.reversed().associate { it.key to it.value } + } + fun getChangelog(version: String): String { return context.assets.open("changelogs/$version.md").use { it.reader().readText() diff --git a/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt index c31aa6b0..d8759327 100644 --- a/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt @@ -40,7 +40,9 @@ class ChangelogsSettingsScreenViewModel @Inject constructor( kvStorage: KVStorage, @ApplicationContext context: Context ) : ViewModel() { - val index = Changelogs(context, kvStorage).index + private val changelogs = Changelogs(context, kvStorage) + val index = changelogs.index + val list = changelogs.getList() } @OptIn(ExperimentalMaterial3Api::class) @@ -80,11 +82,11 @@ fun ChangelogsSettingsScreen( LazyColumn { items( - viewModel.index.list.size, - key = { viewModel.index.list.keys.elementAt(it) } + viewModel.list.size, + key = { viewModel.list.keys.elementAt(it) } ) { index -> - val version = viewModel.index.list.keys.elementAt(index) - val changelog = viewModel.index.list[version]!! + val version = viewModel.list.keys.elementAt(index) + val changelog = viewModel.list[version]!! Column( modifier = Modifier