From 0f8290a4f5a8d01e92684886e71cd3779712a0ff Mon Sep 17 00:00:00 2001 From: Diego Beraldin Date: Sat, 18 Nov 2023 23:18:55 +0100 Subject: [PATCH] version 1.0.0-RC8 --- androidApp/build.gradle.kts | 4 ++-- androidApp/src/main/AndroidManifest.xml | 1 + .../core/api/provider/DefaultServiceProvider.kt | 10 ++++------ .../core/commonui/modals/LanguageBottomSheet.kt | 4 ++-- .../raccoonforlemmy/core/utils/Extensions.kt | 4 ++-- fastlane/metadata/android/en-US/changelogs/39.txt | 4 ++++ resources/src/commonMain/resources/MR/base/strings.xml | 4 ++-- .../src/commonMain/resources/MR/{cz => cs}/strings.xml | 0 .../src/commonMain/resources/MR/{dk => da}/strings.xml | 0 9 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/39.txt rename resources/src/commonMain/resources/MR/{cz => cs}/strings.xml (100%) rename resources/src/commonMain/resources/MR/{dk => da}/strings.xml (100%) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 4ab92bdb2..de51b75f4 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -15,8 +15,8 @@ android { applicationId = "com.github.diegoberaldin.raccoonforlemmy.android" minSdk = libs.versions.android.minSdk.get().toInt() targetSdk = libs.versions.android.targetSdk.get().toInt() - versionCode = 38 - versionName = "1.0.0-RC7" + versionCode = 39 + versionName = "1.0.0-RC8" archivesName.set("RaccoonForLemmy") } buildFeatures { diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml index b26e16c2f..8e0d3cf14 100644 --- a/androidApp/src/main/AndroidManifest.xml +++ b/androidApp/src/main/AndroidManifest.xml @@ -25,4 +25,5 @@ + \ No newline at end of file diff --git a/core-api/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/api/provider/DefaultServiceProvider.kt b/core-api/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/api/provider/DefaultServiceProvider.kt index 49346719a..7731aeb2f 100644 --- a/core-api/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/api/provider/DefaultServiceProvider.kt +++ b/core-api/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/api/provider/DefaultServiceProvider.kt @@ -14,8 +14,6 @@ import io.ktor.client.HttpClient import io.ktor.client.plugins.HttpTimeout import io.ktor.client.plugins.contentnegotiation.ContentNegotiation import io.ktor.client.plugins.defaultRequest -import io.ktor.client.plugins.logging.LogLevel -import io.ktor.client.plugins.logging.Logging import io.ktor.serialization.kotlinx.json.json import kotlinx.serialization.json.Json @@ -80,10 +78,10 @@ internal class DefaultServiceProvider : ServiceProvider { connectTimeoutMillis = 30_000 socketTimeoutMillis = 30_000 } - install(Logging) { - logger = defaultLogger - level = LogLevel.ALL - } +// install(Logging) { +// logger = defaultLogger +// level = LogLevel.ALL +// } install(ContentNegotiation) { json(Json { isLenient = true; ignoreUnknownKeys = true }) } diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt index d2d1d9432..9e6e3ec40 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt @@ -53,8 +53,8 @@ class LanguageBottomSheet : Screen { ) val values = listOf( "bg", - "cz", - "dk", + "cs", + "da", "de", "el", "en", diff --git a/core-utils/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/utils/Extensions.kt b/core-utils/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/utils/Extensions.kt index 2feaaeccd..2dd97ea33 100644 --- a/core-utils/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/utils/Extensions.kt +++ b/core-utils/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/utils/Extensions.kt @@ -10,8 +10,8 @@ import kotlin.math.round @Composable fun String.toLanguageName() = when (this) { "bg" -> stringResource(MR.strings.language_bg) - "cz" -> stringResource(MR.strings.language_cz) - "dk" -> stringResource(MR.strings.language_dk) + "cs" -> stringResource(MR.strings.language_cs) + "da" -> stringResource(MR.strings.language_da) "de" -> stringResource(MR.strings.language_de) "el" -> stringResource(MR.strings.language_el) "es" -> stringResource(MR.strings.language_es) diff --git a/fastlane/metadata/android/en-US/changelogs/39.txt b/fastlane/metadata/android/en-US/changelogs/39.txt new file mode 100644 index 000000000..db60d9a52 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/39.txt @@ -0,0 +1,4 @@ +- fix: change feed and sort type +- enhancement: inbox loading +- fix: minor bug fixes and stability improvements +- chore: add new l10ns \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/base/strings.xml b/resources/src/commonMain/resources/MR/base/strings.xml index e367583cf..8b33ec584 100755 --- a/resources/src/commonMain/resources/MR/base/strings.xml +++ b/resources/src/commonMain/resources/MR/base/strings.xml @@ -99,9 +99,9 @@ Instance: %1$s en български - Čeština + Čeština Deutsch - Dansk + Dansk Ελληνικά English Español diff --git a/resources/src/commonMain/resources/MR/cz/strings.xml b/resources/src/commonMain/resources/MR/cs/strings.xml similarity index 100% rename from resources/src/commonMain/resources/MR/cz/strings.xml rename to resources/src/commonMain/resources/MR/cs/strings.xml diff --git a/resources/src/commonMain/resources/MR/dk/strings.xml b/resources/src/commonMain/resources/MR/da/strings.xml similarity index 100% rename from resources/src/commonMain/resources/MR/dk/strings.xml rename to resources/src/commonMain/resources/MR/da/strings.xml