diff --git a/android-project/app/src/main/ic_launcher-playstore.png b/android-project/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..3ba7d93 Binary files /dev/null and b/android-project/app/src/main/ic_launcher-playstore.png differ diff --git a/android-project/app/src/main/res/drawable/ic_launcher_background.xml b/android-project/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..3b4bfbb --- /dev/null +++ b/android-project/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/android-project/app/src/main/res/drawable/ic_launcher_foreground.xml b/android-project/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..50b21b6 --- /dev/null +++ b/android-project/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/android-project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android-project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..bbd3e02 --- /dev/null +++ b/android-project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android-project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android-project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..bbd3e02 --- /dev/null +++ b/android-project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android-project/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android-project/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 17b85aa..0000000 Binary files a/android-project/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/android-project/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android-project/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..535b40f Binary files /dev/null and b/android-project/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/android-project/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android-project/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..87981a7 Binary files /dev/null and b/android-project/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/android-project/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android-project/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 197a321..0000000 Binary files a/android-project/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/android-project/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android-project/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..20292dd Binary files /dev/null and b/android-project/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/android-project/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/android-project/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..fe95d45 Binary files /dev/null and b/android-project/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 3e513e6..0000000 Binary files a/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..ebb50cf Binary files /dev/null and b/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..616b3a8 Binary files /dev/null and b/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 029b457..0000000 Binary files a/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..b51b9c0 Binary files /dev/null and b/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..0f3758c Binary files /dev/null and b/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 8bf75b7..0000000 Binary files a/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..bbe31d2 Binary files /dev/null and b/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..4c68ca4 Binary files /dev/null and b/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/fill_logo.svg b/fill_logo.svg deleted file mode 100644 index 7c4950b..0000000 --- a/fill_logo.svg +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/logo_background.svg b/logo_background.svg new file mode 100644 index 0000000..ef01d3d --- /dev/null +++ b/logo_background.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + diff --git a/logo_foreground.svg b/logo_foreground.svg new file mode 100644 index 0000000..86d03b8 --- /dev/null +++ b/logo_foreground.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + diff --git a/src/GlobalConfig.cpp b/src/GlobalConfig.cpp index 52d3eb1..5a7b5d6 100644 --- a/src/GlobalConfig.cpp +++ b/src/GlobalConfig.cpp @@ -29,6 +29,8 @@ GlobalConfig::GlobalConfig() { SDL_GetDateTimeLocalePreferences(&dateFormat, &timeFormat); if(dateFormat == SDL_DATE_FORMAT_YYYYMMDD) // Can't display this in a friendly way, so changing it for now dateFormat = SDL_DATE_FORMAT_DDMMYYYY; + if(timeFormat == SDL_TIME_FORMAT_24HR) + timeFormat = SDL_TIME_FORMAT_12HR; // For now, lock at 12 hour since it's the most used format, and time format detection doesn't work properly all the time } nlohmann::json GlobalConfig::get_config_json(const InputManager& input) const {