diff --git a/docs/logo/OSciMap.svg b/docs/logo/OSciMap.svg new file mode 100644 index 00000000..3881f873 --- /dev/null +++ b/docs/logo/OSciMap.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/logo/VTM.svg b/docs/logo/VTM.svg new file mode 100644 index 00000000..2893b423 --- /dev/null +++ b/docs/logo/VTM.svg @@ -0,0 +1,477 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/logo/puzzle.svg b/docs/logo/puzzle.svg new file mode 100644 index 00000000..8367df7d --- /dev/null +++ b/docs/logo/puzzle.svg @@ -0,0 +1,460 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vtm-android-example/AndroidManifest.xml b/vtm-android-example/AndroidManifest.xml index ab246a2e..120d04b1 100644 --- a/vtm-android-example/AndroidManifest.xml +++ b/vtm-android-example/AndroidManifest.xml @@ -11,7 +11,7 @@ diff --git a/vtm-app/res/drawable-hdpi/ic_launcher.png b/vtm-app/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 6a0db8b6..00000000 Binary files a/vtm-app/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/vtm-app/res/drawable-mdpi/ic_launcher.png b/vtm-app/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index bf571d67..00000000 Binary files a/vtm-app/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/vtm-app/res/drawable-nodpi/ic_launcher.png b/vtm-app/res/drawable-nodpi/ic_launcher.png deleted file mode 100644 index 5e951fcb..00000000 Binary files a/vtm-app/res/drawable-nodpi/ic_launcher.png and /dev/null differ diff --git a/vtm-app/res/drawable-xhdpi/ic_launcher.png b/vtm-app/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 436ec1cc..00000000 Binary files a/vtm-app/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/vtm-app/res/drawable/globe2.png b/vtm-app/res/drawable/globe2.png deleted file mode 100644 index 6d788024..00000000 Binary files a/vtm-app/res/drawable/globe2.png and /dev/null differ diff --git a/vtm-app/res/mipmap-hdpi/ic_launcher.png b/vtm-app/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..5aff7e8c Binary files /dev/null and b/vtm-app/res/mipmap-hdpi/ic_launcher.png differ diff --git a/vtm-app/res/mipmap-mdpi/ic_launcher.png b/vtm-app/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..1421b3be Binary files /dev/null and b/vtm-app/res/mipmap-mdpi/ic_launcher.png differ diff --git a/vtm-app/res/mipmap-xhdpi/ic_launcher.png b/vtm-app/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..2a2b3a3b Binary files /dev/null and b/vtm-app/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/vtm-app/res/mipmap-xxhdpi/ic_launcher.png b/vtm-app/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..1174ac8a Binary files /dev/null and b/vtm-app/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/vtm-app/res/mipmap-xxxhdpi/ic_launcher.png b/vtm-app/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..0267a8c2 Binary files /dev/null and b/vtm-app/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java b/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java index e10ba3c0..af9c6900 100644 --- a/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java +++ b/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java @@ -1,6 +1,7 @@ /* * Copyright 2013 Hannes Janetzek * Copyright 2016-2018 devemux86 + * Copyright 2018 Gustl22 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -17,6 +18,7 @@ */ package org.oscim.gdx; +import com.badlogic.gdx.Files; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; import com.badlogic.gdx.utils.SharedLibraryLoader; @@ -62,6 +64,13 @@ public class GdxMapApp extends GdxMap { LwjglApplicationConfiguration.disableAudio = true; LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration(); cfg.title = title != null ? title : "vtm-gdx"; + + int[] sizes = new int[]{128, 64, 32, 16}; + for (int size : sizes) { + String path = "res/ic_vtm_" + size + ".png"; + cfg.addIcon(path, Files.FileType.Internal); + } + cfg.width = 800; cfg.height = 600; cfg.stencil = 8; diff --git a/vtm-playground/resources/res/ic_vtm_128.png b/vtm-playground/resources/res/ic_vtm_128.png new file mode 100644 index 00000000..082e98a0 Binary files /dev/null and b/vtm-playground/resources/res/ic_vtm_128.png differ diff --git a/vtm-playground/resources/res/ic_vtm_16.png b/vtm-playground/resources/res/ic_vtm_16.png new file mode 100644 index 00000000..7469e741 Binary files /dev/null and b/vtm-playground/resources/res/ic_vtm_16.png differ diff --git a/vtm-playground/resources/res/ic_vtm_32.png b/vtm-playground/resources/res/ic_vtm_32.png new file mode 100644 index 00000000..1a0cac4a Binary files /dev/null and b/vtm-playground/resources/res/ic_vtm_32.png differ diff --git a/vtm-playground/resources/res/ic_vtm_64.png b/vtm-playground/resources/res/ic_vtm_64.png new file mode 100644 index 00000000..44dd40dc Binary files /dev/null and b/vtm-playground/resources/res/ic_vtm_64.png differ diff --git a/vtm-web-app/resources/assets/logo/ic_vtm.svg b/vtm-web-app/resources/assets/logo/ic_vtm.svg new file mode 100644 index 00000000..8367df7d --- /dev/null +++ b/vtm-web-app/resources/assets/logo/ic_vtm.svg @@ -0,0 +1,460 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vtm-web-app/war/index.html b/vtm-web-app/war/index.html index bd3a674b..00b181e4 100644 --- a/vtm-web-app/war/index.html +++ b/vtm-web-app/war/index.html @@ -2,6 +2,7 @@ vtm-gdx +