Update the directory structure to make room for additional Godot Android samples besides plugins

44 files changed, 16 insertions, 8 deletions

diff --git a/README.md b/README.md
index 9d8790e..3ce50a1 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# Godot-Android-Plugins
+# Godot-Android-Samples
 
 **Requires Godot 4.2 or above**
 
-Collection of samples showcasing how Godot Android plugins are built and packaged.
+Collection of samples showcasing how to integrate Godot into Android libraries, plugins and 
+applications.
 
- - [Hello World plugin](hello_world/README.md)
- - [Hello Signals plugin](hello_signals/README.md)
+ - [plugins](plugins/README.md): Contains sample plugins
diff --git a/config.gradle b/config.gradle
index 1834891..6e07526 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,8 +4,8 @@ ext {
             compileSdk         : 33,
             minSdk             : 21,
             targetSdk          : 33,
-            godotLibVersion       : '4.1.0.stable',
-            javaVersion           : JavaVersion.VERSION_11,
+            godotLibVersion    : '4.1.0.stable',
+            javaVersion        : JavaVersion.VERSION_11,
             kotlinVersion      : '1.7.21',
     ]
 }
diff --git a/plugins/README.md b/plugins/README.md
new file mode 100644
index 0000000..9437f4f
--- /dev/null
+++ b/plugins/README.md
@@ -0,0 +1,8 @@
+# Godot-Android-Plugins
+
+**Requires Godot 4.2 or above**
+
+Collection of samples showcasing how Godot Android plugins are built and packaged.
+
+- [Hello World plugin](hello_world/README.md)
+- [Hello Signals plugin](hello_signals/README.md)
diff --git a/hello_signals/.gitignore b/plugins/hello_signals/.gitignore
index 796b96d..796b96d 100644
--- a/hello_signals/.gitignore
+++ b/plugins/hello_signals/.gitignore
diff --git a/hello_signals/README.md b/plugins/hello_signals/README.md
index 7845f21..7845f21 100644
--- a/hello_signals/README.md
+++ b/plugins/hello_signals/README.md
diff --git a/hello_signals/build.gradle b/plugins/hello_signals/build.gradle
index 6549636..6549636 100644
--- a/hello_signals/build.gradle
+++ b/plugins/hello_signals/build.gradle
diff --git a/hello_signals/demo/.gitignore b/plugins/hello_signals/demo/.gitignore
index b405634..b405634 100644
--- a/hello_signals/demo/.gitignore
+++ b/plugins/hello_signals/demo/.gitignore
diff --git a/hello_signals/demo/Main.gd b/plugins/hello_signals/demo/Main.gd
index 2dca0db..2dca0db 100644
--- a/hello_signals/demo/Main.gd
+++ b/plugins/hello_signals/demo/Main.gd
diff --git a/hello_signals/demo/Main.tscn b/plugins/hello_signals/demo/Main.tscn
index 2f51657..2f51657 100644
--- a/hello_signals/demo/Main.tscn
+++ b/plugins/hello_signals/demo/Main.tscn
diff --git a/hello_signals/demo/addons/hello_signals_plugin/export/.gdignore b/plugins/hello_signals/demo/addons/hello_signals_plugin/export/.gdignore
index 8b13789..8b13789 100644
--- a/hello_signals/demo/addons/hello_signals_plugin/export/.gdignore
+++ b/plugins/hello_signals/demo/addons/hello_signals_plugin/export/.gdignore
diff --git a/hello_signals/demo/addons/hello_signals_plugin/export/HelloSignals.debug.aar b/plugins/hello_signals/demo/addons/hello_signals_plugin/export/HelloSignals.debug.aar
index d241ab1..d241ab1 100644
--- a/hello_signals/demo/addons/hello_signals_plugin/export/HelloSignals.debug.aar
+++ b/plugins/hello_signals/demo/addons/hello_signals_plugin/export/HelloSignals.debug.aar
diff --git a/hello_signals/demo/addons/hello_signals_plugin/export/HelloSignals.release.aar b/plugins/hello_signals/demo/addons/hello_signals_plugin/export/HelloSignals.release.aar
index 6dae345..6dae345 100644
--- a/hello_signals/demo/addons/hello_signals_plugin/export/HelloSignals.release.aar
+++ b/plugins/hello_signals/demo/addons/hello_signals_plugin/export/HelloSignals.release.aar
diff --git a/hello_signals/demo/addons/hello_signals_plugin/export/hello_signals_editor_export_plugin.gd b/plugins/hello_signals/demo/addons/hello_signals_plugin/export/hello_signals_editor_export_plugin.gd
index f0f3288..f0f3288 100644
--- a/hello_signals/demo/addons/hello_signals_plugin/export/hello_signals_editor_export_plugin.gd
+++ b/plugins/hello_signals/demo/addons/hello_signals_plugin/export/hello_signals_editor_export_plugin.gd
diff --git a/hello_signals/demo/addons/hello_signals_plugin/export/hello_signals_editor_plugin.gd b/plugins/hello_signals/demo/addons/hello_signals_plugin/export/hello_signals_editor_plugin.gd
index 5c71083..5c71083 100644
--- a/hello_signals/demo/addons/hello_signals_plugin/export/hello_signals_editor_plugin.gd
+++ b/plugins/hello_signals/demo/addons/hello_signals_plugin/export/hello_signals_editor_plugin.gd
diff --git a/hello_signals/demo/addons/hello_signals_plugin/interface/hello_signals_plugin.gd b/plugins/hello_signals/demo/addons/hello_signals_plugin/interface/hello_signals_plugin.gd
index 0cc9c1d..0cc9c1d 100644
--- a/hello_signals/demo/addons/hello_signals_plugin/interface/hello_signals_plugin.gd
+++ b/plugins/hello_signals/demo/addons/hello_signals_plugin/interface/hello_signals_plugin.gd
diff --git a/hello_signals/demo/addons/hello_signals_plugin/plugin.cfg b/plugins/hello_signals/demo/addons/hello_signals_plugin/plugin.cfg
index b32555f..b32555f 100644
--- a/hello_signals/demo/addons/hello_signals_plugin/plugin.cfg
+++ b/plugins/hello_signals/demo/addons/hello_signals_plugin/plugin.cfg
diff --git a/hello_signals/demo/default_env.tres b/plugins/hello_signals/demo/default_env.tres
index 529d705..529d705 100644
--- a/hello_signals/demo/default_env.tres
+++ b/plugins/hello_signals/demo/default_env.tres
diff --git a/hello_signals/demo/export_presets.cfg b/plugins/hello_signals/demo/export_presets.cfg
index 1d4cb1f..1d4cb1f 100644
--- a/hello_signals/demo/export_presets.cfg
+++ b/plugins/hello_signals/demo/export_presets.cfg
diff --git a/hello_signals/demo/icon.png b/plugins/hello_signals/demo/icon.png
index c98fbb6..c98fbb6 100644
--- a/hello_signals/demo/icon.png
+++ b/plugins/hello_signals/demo/icon.png
diff --git a/hello_signals/demo/project.godot b/plugins/hello_signals/demo/project.godot
index 655eefc..655eefc 100644
--- a/hello_signals/demo/project.godot
+++ b/plugins/hello_signals/demo/project.godot
diff --git a/hello_signals/src/main/AndroidManifest.xml b/plugins/hello_signals/src/main/AndroidManifest.xml
index 8f791bd..8f791bd 100644
--- a/hello_signals/src/main/AndroidManifest.xml
+++ b/plugins/hello_signals/src/main/AndroidManifest.xml
diff --git a/hello_signals/src/main/java/fhuyakou/godot/plugin/android/hellosignals/HelloSignalsPlugin.kt b/plugins/hello_signals/src/main/java/fhuyakou/godot/plugin/android/hellosignals/HelloSignalsPlugin.kt
index d6df7ef..d6df7ef 100644
--- a/hello_signals/src/main/java/fhuyakou/godot/plugin/android/hellosignals/HelloSignalsPlugin.kt
+++ b/plugins/hello_signals/src/main/java/fhuyakou/godot/plugin/android/hellosignals/HelloSignalsPlugin.kt
diff --git a/hello_world/.gitignore b/plugins/hello_world/.gitignore
index 796b96d..796b96d 100644
--- a/hello_world/.gitignore
+++ b/plugins/hello_world/.gitignore
diff --git a/hello_world/README.md b/plugins/hello_world/README.md
index 5cfb640..5cfb640 100644
--- a/hello_world/README.md
+++ b/plugins/hello_world/README.md
diff --git a/hello_world/build.gradle b/plugins/hello_world/build.gradle
index 4c12e93..4c12e93 100644
--- a/hello_world/build.gradle
+++ b/plugins/hello_world/build.gradle
diff --git a/hello_world/demo/.gitignore b/plugins/hello_world/demo/.gitignore
index b405634..b405634 100644
--- a/hello_world/demo/.gitignore
+++ b/plugins/hello_world/demo/.gitignore
diff --git a/hello_world/demo/Main.gd b/plugins/hello_world/demo/Main.gd
index c5174eb..c5174eb 100644
--- a/hello_world/demo/Main.gd
+++ b/plugins/hello_world/demo/Main.gd
diff --git a/hello_world/demo/Main.tscn b/plugins/hello_world/demo/Main.tscn
index 57d3eb0..57d3eb0 100644
--- a/hello_world/demo/Main.tscn
+++ b/plugins/hello_world/demo/Main.tscn
diff --git a/hello_world/demo/addons/hello_world_plugin/export/.gdignore b/plugins/hello_world/demo/addons/hello_world_plugin/export/.gdignore
index e69de29..e69de29 100644
--- a/hello_world/demo/addons/hello_world_plugin/export/.gdignore
+++ b/plugins/hello_world/demo/addons/hello_world_plugin/export/.gdignore
diff --git a/hello_world/demo/addons/hello_world_plugin/export/HelloWorld.debug.aar b/plugins/hello_world/demo/addons/hello_world_plugin/export/HelloWorld.debug.aar
index 4d59e06..4d59e06 100644
--- a/hello_world/demo/addons/hello_world_plugin/export/HelloWorld.debug.aar
+++ b/plugins/hello_world/demo/addons/hello_world_plugin/export/HelloWorld.debug.aar
diff --git a/hello_world/demo/addons/hello_world_plugin/export/HelloWorld.release.aar b/plugins/hello_world/demo/addons/hello_world_plugin/export/HelloWorld.release.aar
index 6b112c5..6b112c5 100644
--- a/hello_world/demo/addons/hello_world_plugin/export/HelloWorld.release.aar
+++ b/plugins/hello_world/demo/addons/hello_world_plugin/export/HelloWorld.release.aar
diff --git a/hello_world/demo/addons/hello_world_plugin/export/hello_world_editor_export_plugin.gd b/plugins/hello_world/demo/addons/hello_world_plugin/export/hello_world_editor_export_plugin.gd
index 46a8a3b..46a8a3b 100644
--- a/hello_world/demo/addons/hello_world_plugin/export/hello_world_editor_export_plugin.gd
+++ b/plugins/hello_world/demo/addons/hello_world_plugin/export/hello_world_editor_export_plugin.gd
diff --git a/hello_world/demo/addons/hello_world_plugin/export/hello_world_editor_plugin.gd b/plugins/hello_world/demo/addons/hello_world_plugin/export/hello_world_editor_plugin.gd
index 3865634..3865634 100644
--- a/hello_world/demo/addons/hello_world_plugin/export/hello_world_editor_plugin.gd
+++ b/plugins/hello_world/demo/addons/hello_world_plugin/export/hello_world_editor_plugin.gd
diff --git a/hello_world/demo/addons/hello_world_plugin/interface/hello_world_plugin.gd b/plugins/hello_world/demo/addons/hello_world_plugin/interface/hello_world_plugin.gd
index ed84ef3..ed84ef3 100644
--- a/hello_world/demo/addons/hello_world_plugin/interface/hello_world_plugin.gd
+++ b/plugins/hello_world/demo/addons/hello_world_plugin/interface/hello_world_plugin.gd
diff --git a/hello_world/demo/addons/hello_world_plugin/plugin.cfg b/plugins/hello_world/demo/addons/hello_world_plugin/plugin.cfg
index bc8575e..bc8575e 100644
--- a/hello_world/demo/addons/hello_world_plugin/plugin.cfg
+++ b/plugins/hello_world/demo/addons/hello_world_plugin/plugin.cfg
diff --git a/hello_world/demo/default_env.tres b/plugins/hello_world/demo/default_env.tres
index 3868def..3868def 100644
--- a/hello_world/demo/default_env.tres
+++ b/plugins/hello_world/demo/default_env.tres
diff --git a/hello_world/demo/export_presets.cfg b/plugins/hello_world/demo/export_presets.cfg
index 6356705..6356705 100644
--- a/hello_world/demo/export_presets.cfg
+++ b/plugins/hello_world/demo/export_presets.cfg
diff --git a/hello_world/demo/icon.png b/plugins/hello_world/demo/icon.png
index 5f7f827..5f7f827 100644
--- a/hello_world/demo/icon.png
+++ b/plugins/hello_world/demo/icon.png
diff --git a/hello_world/demo/project.godot b/plugins/hello_world/demo/project.godot
index 3fcf242..3fcf242 100644
--- a/hello_world/demo/project.godot
+++ b/plugins/hello_world/demo/project.godot
diff --git a/hello_world/src/main/AndroidManifest.xml b/plugins/hello_world/src/main/AndroidManifest.xml
index 8bb5fa4..8bb5fa4 100644
--- a/hello_world/src/main/AndroidManifest.xml
+++ b/plugins/hello_world/src/main/AndroidManifest.xml
diff --git a/hello_world/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java b/plugins/hello_world/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java
index 1dfa1b2..1dfa1b2 100644
--- a/hello_world/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java
+++ b/plugins/hello_world/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java
diff --git a/hello_world/src/main/res/layout/hello_world_view.xml b/plugins/hello_world/src/main/res/layout/hello_world_view.xml
index e831d87..e831d87 100644
--- a/hello_world/src/main/res/layout/hello_world_view.xml
+++ b/plugins/hello_world/src/main/res/layout/hello_world_view.xml
diff --git a/hello_world/src/main/res/values/strings.xml b/plugins/hello_world/src/main/res/values/strings.xml
index d2cf3ac..d2cf3ac 100644
--- a/hello_world/src/main/res/values/strings.xml
+++ b/plugins/hello_world/src/main/res/values/strings.xml
diff --git a/settings.gradle b/settings.gradle
index ed12156..680d1ad 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,5 +14,5 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "Godot Android Plugins"
-include ':hello_world', ':hello_signals'
+rootProject.name = "Godot Android Samples"
+include ':plugins:hello_world', ':plugins:hello_signals'