diff --git a/SettingsPage.tsx b/SettingsPage.tsx index 92675d8..135be9c 100644 --- a/SettingsPage.tsx +++ b/SettingsPage.tsx @@ -21,8 +21,24 @@ import Switch from './Switch' import {toast} from './toast' import {useTheme} from './use-theme' -const twelveHours = ['P', 'Pp', 'ccc p', 'p', 'yyyy-MM-d', 'yyyy.MM.d'] -const twentyFours = ['P', 'P, k:m', 'ccc k:m', 'k:m', 'yyyy-MM-d', 'yyyy.MM.d'] +const twelveHours = [ + 'dd/LL/yyyy', + 'dd/LL/yyyy, p', + 'ccc p', + 'p', + 'yyyy-MM-d', + 'yyyy-MM-d, p', + 'yyyy.MM.d', +] +const twentyFours = [ + 'dd/LL/yyyy', + 'dd/LL/yyyy, k:m', + 'ccc k:m', + 'k:m', + 'yyyy-MM-d', + 'yyyy-MM-d, k:m', + 'yyyy.MM.d', +] export default function SettingsPage() { const [ignoring, setIgnoring] = useState(false) diff --git a/android/app/build.gradle b/android/app/build.gradle index 44cd115..f25df0e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -41,8 +41,8 @@ android { missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 36164 - versionName "1.138" + versionCode 36165 + versionName "1.139" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/package.json b/package.json index f12a842..5e792fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "massive", - "version": "1.138", + "version": "1.139", "private": true, "license": "GPL-3.0-only", "scripts": {