diff --git a/examples/example_android_vulkan/app/src/main/cpp/CMakeLists.txt b/examples/example_android_vulkan/CMakeLists.txt similarity index 94% rename from examples/example_android_vulkan/app/src/main/cpp/CMakeLists.txt rename to examples/example_android_vulkan/CMakeLists.txt index 84db20505..e3ce8f41b 100644 --- a/examples/example_android_vulkan/app/src/main/cpp/CMakeLists.txt +++ b/examples/example_android_vulkan/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -set(IMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../..) +set(IMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) add_library(${CMAKE_PROJECT_NAME} SHARED ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp diff --git a/examples/example_android_vulkan/.gitignore b/examples/example_android_vulkan/android/.gitignore similarity index 100% rename from examples/example_android_vulkan/.gitignore rename to examples/example_android_vulkan/android/.gitignore diff --git a/examples/example_android_vulkan/app/.gitignore b/examples/example_android_vulkan/android/app/.gitignore similarity index 100% rename from examples/example_android_vulkan/app/.gitignore rename to examples/example_android_vulkan/android/app/.gitignore diff --git a/examples/example_android_vulkan/app/build.gradle.kts b/examples/example_android_vulkan/android/app/build.gradle.kts similarity index 95% rename from examples/example_android_vulkan/app/build.gradle.kts rename to examples/example_android_vulkan/android/app/build.gradle.kts index 3eb8ca448..ca37638ba 100644 --- a/examples/example_android_vulkan/app/build.gradle.kts +++ b/examples/example_android_vulkan/android/app/build.gradle.kts @@ -42,7 +42,7 @@ android { externalNativeBuild { cmake { - path = file("src/main/cpp/CMakeLists.txt") + path = file("../../CMakeLists.txt") version = "3.22.1" } } diff --git a/examples/example_android_vulkan/app/proguard-rules.pro b/examples/example_android_vulkan/android/app/proguard-rules.pro similarity index 100% rename from examples/example_android_vulkan/app/proguard-rules.pro rename to examples/example_android_vulkan/android/app/proguard-rules.pro diff --git a/examples/example_android_vulkan/app/src/main/AndroidManifest.xml b/examples/example_android_vulkan/android/app/src/main/AndroidManifest.xml similarity index 61% rename from examples/example_android_vulkan/app/src/main/AndroidManifest.xml rename to examples/example_android_vulkan/android/app/src/main/AndroidManifest.xml index 6b5bcac5a..788a0d151 100644 --- a/examples/example_android_vulkan/app/src/main/AndroidManifest.xml +++ b/examples/example_android_vulkan/android/app/src/main/AndroidManifest.xml @@ -2,16 +2,13 @@ + android:allowBackup="false" + android:fullBackupContent="false" + android:label="ImGuiExample Vulkan" + android:supportsRtl="true"> diff --git a/examples/example_android_vulkan/app/src/main/java/imgui/example/android/vulkan/MainActivity.kt b/examples/example_android_vulkan/android/app/src/main/java/MainActivity.kt similarity index 100% rename from examples/example_android_vulkan/app/src/main/java/imgui/example/android/vulkan/MainActivity.kt rename to examples/example_android_vulkan/android/app/src/main/java/MainActivity.kt diff --git a/examples/example_android_vulkan/app/src/main/jniLibs/arm64-v8a/libVkLayer_khronos_validation.so b/examples/example_android_vulkan/android/app/src/main/jniLibs/arm64-v8a/libVkLayer_khronos_validation.so similarity index 100% rename from examples/example_android_vulkan/app/src/main/jniLibs/arm64-v8a/libVkLayer_khronos_validation.so rename to examples/example_android_vulkan/android/app/src/main/jniLibs/arm64-v8a/libVkLayer_khronos_validation.so diff --git a/examples/example_android_vulkan/app/src/main/jniLibs/armeabi-v7a/libVkLayer_khronos_validation.so b/examples/example_android_vulkan/android/app/src/main/jniLibs/armeabi-v7a/libVkLayer_khronos_validation.so similarity index 100% rename from examples/example_android_vulkan/app/src/main/jniLibs/armeabi-v7a/libVkLayer_khronos_validation.so rename to examples/example_android_vulkan/android/app/src/main/jniLibs/armeabi-v7a/libVkLayer_khronos_validation.so diff --git a/examples/example_android_vulkan/app/src/main/jniLibs/x86/libVkLayer_khronos_validation.so b/examples/example_android_vulkan/android/app/src/main/jniLibs/x86/libVkLayer_khronos_validation.so similarity index 100% rename from examples/example_android_vulkan/app/src/main/jniLibs/x86/libVkLayer_khronos_validation.so rename to examples/example_android_vulkan/android/app/src/main/jniLibs/x86/libVkLayer_khronos_validation.so diff --git a/examples/example_android_vulkan/app/src/main/jniLibs/x86_64/libVkLayer_khronos_validation.so b/examples/example_android_vulkan/android/app/src/main/jniLibs/x86_64/libVkLayer_khronos_validation.so similarity index 100% rename from examples/example_android_vulkan/app/src/main/jniLibs/x86_64/libVkLayer_khronos_validation.so rename to examples/example_android_vulkan/android/app/src/main/jniLibs/x86_64/libVkLayer_khronos_validation.so diff --git a/examples/example_android_vulkan/build.gradle.kts b/examples/example_android_vulkan/android/build.gradle.kts similarity index 100% rename from examples/example_android_vulkan/build.gradle.kts rename to examples/example_android_vulkan/android/build.gradle.kts diff --git a/examples/example_android_vulkan/gradle.properties b/examples/example_android_vulkan/android/gradle.properties similarity index 100% rename from examples/example_android_vulkan/gradle.properties rename to examples/example_android_vulkan/android/gradle.properties diff --git a/examples/example_android_vulkan/gradle/gradle-daemon-jvm.properties b/examples/example_android_vulkan/android/gradle/gradle-daemon-jvm.properties similarity index 100% rename from examples/example_android_vulkan/gradle/gradle-daemon-jvm.properties rename to examples/example_android_vulkan/android/gradle/gradle-daemon-jvm.properties diff --git a/examples/example_android_vulkan/gradle/libs.versions.toml b/examples/example_android_vulkan/android/gradle/libs.versions.toml similarity index 100% rename from examples/example_android_vulkan/gradle/libs.versions.toml rename to examples/example_android_vulkan/android/gradle/libs.versions.toml diff --git a/examples/example_android_vulkan/gradle/wrapper/gradle-wrapper.jar b/examples/example_android_vulkan/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from examples/example_android_vulkan/gradle/wrapper/gradle-wrapper.jar rename to examples/example_android_vulkan/android/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/example_android_vulkan/gradle/wrapper/gradle-wrapper.properties b/examples/example_android_vulkan/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from examples/example_android_vulkan/gradle/wrapper/gradle-wrapper.properties rename to examples/example_android_vulkan/android/gradle/wrapper/gradle-wrapper.properties diff --git a/examples/example_android_vulkan/gradlew b/examples/example_android_vulkan/android/gradlew similarity index 100% rename from examples/example_android_vulkan/gradlew rename to examples/example_android_vulkan/android/gradlew diff --git a/examples/example_android_vulkan/gradlew.bat b/examples/example_android_vulkan/android/gradlew.bat similarity index 100% rename from examples/example_android_vulkan/gradlew.bat rename to examples/example_android_vulkan/android/gradlew.bat diff --git a/examples/example_android_vulkan/settings.gradle.kts b/examples/example_android_vulkan/android/settings.gradle.kts similarity index 100% rename from examples/example_android_vulkan/settings.gradle.kts rename to examples/example_android_vulkan/android/settings.gradle.kts diff --git a/examples/example_android_vulkan/app/src/main/res/drawable/ic_launcher_background.xml b/examples/example_android_vulkan/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9cb..000000000 --- a/examples/example_android_vulkan/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/example_android_vulkan/app/src/main/res/drawable/ic_launcher_foreground.xml b/examples/example_android_vulkan/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 7706ab9e6..000000000 --- a/examples/example_android_vulkan/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/examples/example_android_vulkan/app/src/main/res/mipmap-anydpi/ic_launcher.xml deleted file mode 100644 index b3e26b4c6..000000000 --- a/examples/example_android_vulkan/app/src/main/res/mipmap-anydpi/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/examples/example_android_vulkan/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml deleted file mode 100644 index b3e26b4c6..000000000 --- a/examples/example_android_vulkan/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/examples/example_android_vulkan/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ec..000000000 Binary files a/examples/example_android_vulkan/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/examples/example_android_vulkan/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1b..000000000 Binary files a/examples/example_android_vulkan/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/examples/example_android_vulkan/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e..000000000 Binary files a/examples/example_android_vulkan/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/examples/example_android_vulkan/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da0..000000000 Binary files a/examples/example_android_vulkan/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/examples/example_android_vulkan/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070f..000000000 Binary files a/examples/example_android_vulkan/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/examples/example_android_vulkan/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b..000000000 Binary files a/examples/example_android_vulkan/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/examples/example_android_vulkan/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f9..000000000 Binary files a/examples/example_android_vulkan/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/examples/example_android_vulkan/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f5083..000000000 Binary files a/examples/example_android_vulkan/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/examples/example_android_vulkan/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427e..000000000 Binary files a/examples/example_android_vulkan/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/examples/example_android_vulkan/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/examples/example_android_vulkan/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae37c..000000000 Binary files a/examples/example_android_vulkan/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/examples/example_android_vulkan/app/src/main/res/values/colors.xml b/examples/example_android_vulkan/app/src/main/res/values/colors.xml deleted file mode 100644 index ca1931bca..000000000 --- a/examples/example_android_vulkan/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - diff --git a/examples/example_android_vulkan/app/src/main/res/values/strings.xml b/examples/example_android_vulkan/app/src/main/res/values/strings.xml deleted file mode 100644 index 665cf08bb..000000000 --- a/examples/example_android_vulkan/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - ImGuiExample Vulkan - diff --git a/examples/example_android_vulkan/app/src/main/res/values/themes.xml b/examples/example_android_vulkan/app/src/main/res/values/themes.xml deleted file mode 100644 index ef075267b..000000000 --- a/examples/example_android_vulkan/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,4 +0,0 @@ - - -