1
0
Fork 1

Compare commits

..

5 commits

Author SHA1 Message Date
dependabot[bot]
556b01a56a
Bump com.google.gms:google-services from 4.4.1 to 4.4.2
Bumps com.google.gms:google-services from 4.4.1 to 4.4.2.

---
updated-dependencies:
- dependency-name: com.google.gms:google-services
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-03 13:32:13 +00:00
Rafał Borcz
d0ad5028d8
Add Kashubian language (#2579) 2024-05-31 10:14:48 +02:00
Rafał Borcz
7f6a2435d0
New Crowdin updates (#2578)
* New translations strings.xml (Kashubian)
2024-05-31 10:02:38 +02:00
Rafał Borcz
3a07ec7755
Revert "Bump com.google.android.gms:play-services-ads from 22.6.0 to 23.1.0 (…" (#2580)
This reverts commit c6eea8b84d.
2024-05-31 09:47:32 +02:00
Mikołaj Pich
3f9e1fd08d
Merge branch 'release/2.6.15' into develop 2024-05-30 17:58:43 +02:00
13 changed files with 577 additions and 549 deletions

1
.gitignore vendored
View file

@ -71,6 +71,7 @@ captures/
.idea/deploymentTargetDropDown.xml
.idea/deploymentTargetSelector.xml
.idea/kotlinc.xml
.idea/studiobot.xml
# Keystore files
*.jks

View file

@ -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:23.1.0'
playImplementation 'com.google.android.gms:play-services-ads:22.6.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'

View file

@ -1,14 +1,32 @@
package io.github.wulkanowy.utils
import java.text.SimpleDateFormat
import java.time.*
import java.time.DayOfWeek.*
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.format.DateTimeFormatter
import java.time.temporal.TemporalAdjusters.*
import java.util.*
import java.time.temporal.TemporalAdjusters.firstInMonth
import java.time.temporal.TemporalAdjusters.next
import java.time.temporal.TemporalAdjusters.previous
import java.util.Locale
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()
@ -23,7 +41,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))
format(DateTimeFormatter.ofPattern(pattern, getDefaultLocaleWithFallback()))
fun Instant.toFormattedString(
pattern: String = DEFAULT_DATE_PATTERN,
@ -31,7 +49,7 @@ fun Instant.toFormattedString(
): String = atZone(tz).format(DateTimeFormatter.ofPattern(pattern))
fun Month.getFormattedName(): String {
val formatter = SimpleDateFormat("LLLL", Locale.getDefault())
val formatter = SimpleDateFormat("LLLL", getDefaultLocaleWithFallback())
val date = LocalDateTime.now().withMonth(value)
return formatter.format(date.toInstant(ZoneOffset.UTC).toEpochMilli()).capitalise()
@ -76,7 +94,7 @@ inline val LocalDate.previousOrSameSchoolDay: LocalDate
}
inline val LocalDate.weekDayName: String
get() = format(DateTimeFormatter.ofPattern("EEEE", Locale.getDefault()))
get() = format(DateTimeFormatter.ofPattern("EEEE", getDefaultLocaleWithFallback()))
inline val LocalDate.monday: LocalDate get() = with(MONDAY)

View file

@ -19,6 +19,7 @@
<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>

View file

@ -19,6 +19,7 @@
<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>

File diff suppressed because it is too large Load diff

View file

@ -19,6 +19,7 @@
<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>

View file

@ -19,6 +19,7 @@
<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>

View file

@ -19,6 +19,7 @@
<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>

View file

@ -19,6 +19,7 @@
<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>

View file

@ -19,6 +19,7 @@
<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>

View file

@ -40,6 +40,7 @@
<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>
@ -50,6 +51,7 @@
<item>de</item>
<item>cs</item>
<item>sk</item>
<item>csb</item>
</string-array>
<string-array name="services_interval_entries">

View file

@ -16,7 +16,7 @@ buildscript {
classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version-1.0.20"
classpath 'com.android.tools.build:gradle:8.4.1'
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
classpath 'com.google.gms:google-services:4.4.1'
classpath 'com.google.gms:google-services:4.4.2'
classpath 'com.huawei.agconnect:agcp:1.9.1.303'
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.1'
classpath "com.github.triplet.gradle:play-publisher:3.8.4"