Merge branch 'release/2.6.15'

Merge branch 'release/2.6.14'
Merge branch 'release/2.6.13'
2024-05-30 17:58:37 +02:00 · 2024-05-29 17:38:54 +02:00 · 2024-05-23 23:26:19 +02:00 · 2024-05-23 07:55:06 +02:00 · 2024-05-22 22:06:00 +02:00 · 2024-05-22 09:05:35 +02:00
12 changed files with 549 additions and 577 deletions
--- a/.gitignore
+++ b/.gitignore
@ -71,7 +71,6 @@ captures/
 .idea/deploymentTargetDropDown.xml
 .idea/deploymentTargetSelector.xml
 .idea/kotlinc.xml
-.idea/studiobot.xml

 # Keystore files
 *.jks
--- a/app/build.gradle
+++ b/app/build.gradle
@ -195,7 +195,7 @@ dependencies {

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'

-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:$coroutines"

@ -256,7 +256,7 @@ dependencies {
    playImplementation 'com.google.firebase:firebase-crashlytics:'
    playImplementation 'com.google.firebase:firebase-config'

-    playImplementation 'com.google.android.gms:play-services-ads:22.6.0'
+    playImplementation 'com.google.android.gms:play-services-ads:23.1.0'
    playImplementation "com.google.android.play:integrity:1.3.0"
    playImplementation 'com.google.android.play:app-update-ktx:2.1.0'
    playImplementation 'com.google.android.play:review-ktx:2.0.1'
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@ -1,32 +1,14 @@
 package io.github.wulkanowy.utils

 import java.text.SimpleDateFormat
-import java.time.DayOfWeek.FRIDAY
-import java.time.DayOfWeek.MONDAY
-import java.time.DayOfWeek.SATURDAY
-import java.time.DayOfWeek.SUNDAY
-import java.time.Instant
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.Month
-import java.time.ZoneId
-import java.time.ZoneOffset
+import java.time.*
+import java.time.DayOfWeek.*
 import java.time.format.DateTimeFormatter
-import java.time.temporal.TemporalAdjusters.firstInMonth
-import java.time.temporal.TemporalAdjusters.next
-import java.time.temporal.TemporalAdjusters.previous
-import java.util.Locale
+import java.time.temporal.TemporalAdjusters.*
+import java.util.*

 private const val DEFAULT_DATE_PATTERN = "dd.MM.yyyy"

-fun getDefaultLocaleWithFallback(): Locale {
-    val locale = Locale.getDefault()
-    if (locale.language == "csb") {
-        return Locale.forLanguageTag("pl")
-    }
-    return locale
-}
-
 fun LocalDate.toTimestamp(): Long = atStartOfDay()
    .toInstant(ZoneOffset.UTC)
    .toEpochMilli()
@ -41,7 +23,7 @@ fun String.toLocalDate(format: String = DEFAULT_DATE_PATTERN): LocalDate =
    LocalDate.parse(this, DateTimeFormatter.ofPattern(format))

 fun LocalDate.toFormattedString(pattern: String = DEFAULT_DATE_PATTERN): String =
-    format(DateTimeFormatter.ofPattern(pattern, getDefaultLocaleWithFallback()))
+    format(DateTimeFormatter.ofPattern(pattern))

 fun Instant.toFormattedString(
    pattern: String = DEFAULT_DATE_PATTERN,
@ -49,7 +31,7 @@ fun Instant.toFormattedString(
 ): String = atZone(tz).format(DateTimeFormatter.ofPattern(pattern))

 fun Month.getFormattedName(): String {
-    val formatter = SimpleDateFormat("LLLL", getDefaultLocaleWithFallback())
+    val formatter = SimpleDateFormat("LLLL", Locale.getDefault())

    val date = LocalDateTime.now().withMonth(value)
    return formatter.format(date.toInstant(ZoneOffset.UTC).toEpochMilli()).capitalise()
@ -94,7 +76,7 @@ inline val LocalDate.previousOrSameSchoolDay: LocalDate
    }

 inline val LocalDate.weekDayName: String
-    get() = format(DateTimeFormatter.ofPattern("EEEE", getDefaultLocaleWithFallback()))
+    get() = format(DateTimeFormatter.ofPattern("EEEE", Locale.getDefault()))

 inline val LocalDate.monday: LocalDate get() = with(MONDAY)

--- a/app/src/main/res/values-cs/preferences_values.xml
+++ b/app/src/main/res/values-cs/preferences_values.xml
@ -19,7 +19,6 @@
        <item>Deutsch</item>
        <item>Čeština</item>
        <item>Slovenčina</item>
-        <item>Kaszëbsczi</item>
    </string-array>
    <string-array name="services_interval_entries">
        <item>15 minut</item>
--- a/app/src/main/res/values-csb-rPL/preferences_values.xml
+++ b/app/src/main/res/values-csb-rPL/preferences_values.xml
@ -19,7 +19,6 @@
        <item>Deutsch</item>
        <item>Čeština</item>
        <item>Slovenčina</item>
-        <item>Kaszëbsczi</item>
    </string-array>
    <string-array name="services_interval_entries">
        <item>15 minutów</item>
--- a/app/src/main/res/values-csb-rPL/strings.xml
+++ b/app/src/main/res/values-csb-rPL/strings.xml
--- a/app/src/main/res/values-de/preferences_values.xml
+++ b/app/src/main/res/values-de/preferences_values.xml
@ -19,7 +19,6 @@
        <item>Deutsch</item>
        <item>Čeština</item>
        <item>Slovenčina</item>
-        <item>Kaszëbsczi</item>
    </string-array>
    <string-array name="services_interval_entries">
        <item>15 Minuten</item>
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@ -19,7 +19,6 @@
        <item>Deutsch</item>
        <item>Čeština</item>
        <item>Slovenčina</item>
-        <item>Kaszëbsczi</item>
    </string-array>
    <string-array name="services_interval_entries">
        <item>15 minut</item>
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@ -19,7 +19,6 @@
        <item>Deutsch</item>
        <item>Čeština</item>
        <item>Slovenčina</item>
-        <item>Kaszëbsczi</item>
    </string-array>
    <string-array name="services_interval_entries">
        <item>15 минут</item>
--- a/app/src/main/res/values-sk/preferences_values.xml
+++ b/app/src/main/res/values-sk/preferences_values.xml
@ -19,7 +19,6 @@
        <item>Deutsch</item>
        <item>Čeština</item>
        <item>Slovenčina</item>
-        <item>Kaszëbsczi</item>
    </string-array>
    <string-array name="services_interval_entries">
        <item>15 minút</item>
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@ -19,7 +19,6 @@
        <item>Deutsch</item>
        <item>Čeština</item>
        <item>Slovenčina</item>
-        <item>Kaszëbsczi</item>
    </string-array>
    <string-array name="services_interval_entries">
        <item>15 хвилин</item>
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@ -40,7 +40,6 @@
        <item>Deutsch</item>
        <item>Čeština</item>
        <item>Slovenčina</item>
-        <item>Kaszëbsczi</item>
    </string-array>
    <string-array name="app_language_values" translatable="false">
        <item>system</item>
@ -51,7 +50,6 @@
        <item>de</item>
        <item>cs</item>
        <item>sk</item>
-        <item>csb</item>
    </string-array>

    <string-array name="services_interval_entries">
Author	SHA1	Message	Date
Mikołaj Pich	386ae58817	Merge branch 'release/2.6.15'	2024-05-30 17:58:37 +02:00
Mikołaj Pich	dd3d62c10d	Merge branch 'release/2.6.14'	2024-05-29 17:38:54 +02:00
Mikołaj Pich	05c6c8bc96	Merge branch 'release/2.6.13'	2024-05-23 23:26:19 +02:00
Mikołaj Pich	1f0b400e5a	Merge branch 'release/2.6.12'	2024-05-23 07:55:06 +02:00
Mikołaj Pich	718bbea329	Merge branch 'release/2.6.11'	2024-05-22 22:06:00 +02:00
Mikołaj Pich	8390ccad20	Merge branch 'release/2.6.10'	2024-05-22 09:05:35 +02:00
Mikołaj Pich	bf9f048116	Version 2.6.10	2024-05-22 09:05:30 +02:00
Mikołaj Pich	56bfabdf11	Bump sdk to 2.6.9-SNAPSHOT	2024-05-22 08:14:11 +02:00
Mikołaj Pich	6e2bcfbe02	Merge branch 'release/2.6.9'	2024-05-17 21:23:34 +02:00
Mikołaj Pich	440cc7ae89	Merge branch 'release/2.6.8'	2024-05-17 07:38:46 +02:00
Mikołaj Pich	51dd343299	Merge branch 'release/2.6.7'	2024-05-16 08:50:33 +02:00
Mikołaj Pich	5ee7fee09d	Merge branch 'release/2.6.6'	2024-05-14 22:30:57 +02:00
Mikołaj Pich	ff56348586	Merge branch 'release/2.6.5'	2024-05-12 17:51:02 +02:00
Mikołaj Pich	a69361708e	Merge branch 'release/2.6.4'	2024-05-10 12:34:11 +02:00
Mikołaj Pich	3cbe98d7b8	Merge branch 'release/2.6.3'	2024-05-09 22:58:03 +02:00
Mikołaj Pich	503a97bc4c	Version 2.6.3	2024-05-09 22:57:58 +02:00
Mikołaj Pich	ae6a35121b	Merge branch 'release/2.6.2'	2024-05-08 01:55:38 +02:00
Mikołaj Pich	558addd097	Merge branch 'release/2.6.1'	2024-05-02 15:20:51 +02:00
Mikołaj Pich	e8f9c57c34	Merge branch 'release/2.6.0'	2024-05-01 22:30:48 +02:00
Mikołaj Pich	4d67de8e5f	Merge branch 'bugfix/2.5.8'	2024-04-25 12:45:19 +02:00