mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-18 20:08:53 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -1,12 +1,7 @@
|
||||
> **Note**
|
||||
This fork is attempting to be up to date with new features. Ultimately, we'd like one app that allows for discord, slack, sms, matrix, etc natively, instead of through server-oriented bridges. By loading these as plugins, the user can put together a messaging app that fits their needs. The base app will handle SMS like its predecessor, but also load and use plugins for other messaging platforms.
|
||||
|
||||
---
|
||||
|
||||

|
||||
|
||||
> **Warning**
|
||||
This image is outdated! Will be updating it soon.
|
||||
> **Note**
|
||||
This image is outdated! Nothing has changed as far as UI, so it should be okay for now.
|
||||
|
||||
# QUIK
|
||||
|
||||
|
||||
@@ -42,8 +42,7 @@ class DateFormatter @Inject constructor(val context: Context) {
|
||||
formattedPattern = formattedPattern
|
||||
.replace("h", "HH")
|
||||
.replace("K", "HH")
|
||||
.replace("a", "")
|
||||
.trim()
|
||||
.replace("\\s+a".toRegex(), "")
|
||||
}
|
||||
|
||||
return SimpleDateFormat(formattedPattern, Locale.getDefault())
|
||||
|
||||
Reference in New Issue
Block a user