Rename Android project folder to just android

2025-03-04 23:10:37 +01:00 · 2025-03-04 23:10:37 +01:00 · 0101aeb9b1
commit 0101aeb9b1
parent 22d7d57e37
172 changed files with 10 additions and 10 deletions
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@ -4,7 +4,7 @@ on:
  push:
    paths:
      - 'src/**'
-      - 'build-android/**'
+      - 'android/**'
      - 'data-*/**'
      - 'packaging/**'
      - 'CMakeLists.txt'
@ -12,7 +12,7 @@ on:
  pull_request:
    paths:
      - 'src/**'
-      - 'build-android/**'
+      - 'android/**'
      - 'data-*/**'
      - 'packaging/**'
      - 'CMakeLists.txt'
@ -32,11 +32,11 @@ jobs:

      - name: Build with gradle
        run: |
-          cd build-android
+          cd android
          ./gradlew assemblerelease

      - name: Save apk artifact
        uses: actions/upload-artifact@v4
        with:
          name: principia-release-unsigned.apk
-          path: build-android/principia/build/outputs/apk/release/principia-release-unsigned.apk
+          path: android/principia/build/outputs/apk/release/principia-release-unsigned.apk
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,3 @@
-[submodule "build-android/principia/deps-src"]
-	path = build-android/principia/deps-src
+[submodule "android/principia/deps-src"]
+	path = android/principia/deps-src
 	url = https://github.com/principia-game/android-deps
--- a/build-android/.gitignore
+++ b/build-android/.gitignore
--- a/build-android/build.gradle
+++ b/build-android/build.gradle
--- a/build-android/gradle.properties
+++ b/build-android/gradle.properties
--- a/build-android/gradle/wrapper/gradle-wrapper.jar
+++ b/build-android/gradle/wrapper/gradle-wrapper.jar
--- a/build-android/gradle/wrapper/gradle-wrapper.properties
+++ b/build-android/gradle/wrapper/gradle-wrapper.properties
--- a/build-android/gradlew
+++ b/build-android/gradlew
--- a/build-android/principia/build.gradle
+++ b/build-android/principia/build.gradle
--- a/android/principia/deps-src
+++ b/android/principia/deps-src
@ -0,0 +1 @@
+Subproject commit 855bd88ce3a46cc06de1d113565d0a0ae19e219d
--- a/build-android/principia/src/assets/data
+++ b/build-android/principia/src/assets/data
--- a/build-android/principia/src/main/AndroidManifest.xml
+++ b/build-android/principia/src/main/AndroidManifest.xml
--- a/build-android/principia/src/main/java/com/bithack/principia/PrincipiaActivity.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/PrincipiaActivity.java
--- a/build-android/principia/src/main/java/com/bithack/principia/TMSActivity.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/TMSActivity.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/AnimalDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/AnimalDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/AutosaveDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/AutosaveDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/CamTargeterDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/CamTargeterDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/CodeEditor.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/CodeEditor.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/ColorChooserDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/ColorChooserDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/CommandPadDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/CommandPadDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/CommunityDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/CommunityDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/ConfirmDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/ConfirmDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/ConsumableDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/ConsumableDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/CustomLinearLayout.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/CustomLinearLayout.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/DecorationDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/DecorationDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/DigitalDisplayDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/DigitalDisplayDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/EmitterDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/EmitterDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/EventListenerDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/EventListenerDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/ExportDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/ExportDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/FactoryDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/FactoryDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/FrequencyDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/FrequencyDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/FrequencyRangeDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/FrequencyRangeDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/FxEmitterDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/FxEmitterDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/HelpDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/HelpDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/ImportDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/ImportDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/JumperDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/JumperDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/KeyListenerDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/KeyListenerDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/Level.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/Level.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/LevelDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/LevelDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/LevelProperty.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/LevelProperty.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/LoginDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/LoginDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/Material.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/Material.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/MultiSelectDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/MultiSelectDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/MultiSpinner.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/MultiSpinner.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/NewLevelDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/NewLevelDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/NumberPicker.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/NumberPicker.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/NumberPickerButton.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/NumberPickerButton.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/OpenDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/OpenDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/PkgLevelDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/PkgLevelDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/PlayDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/PlayDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/PolygonDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/PolygonDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/PrincipiaObject.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/PrincipiaObject.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/PromptDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/PromptDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/PromptSettingsDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/PromptSettingsDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/PublishDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/PublishDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/PublishedDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/PublishedDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/PuzzlePlayDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/PuzzlePlayDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/QuickaddDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/QuickaddDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/RangeSeekBar.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/RangeSeekBar.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/Recipe.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/Recipe.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/RegisterDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/RegisterDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/ResourceDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/ResourceDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/RobotDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/RobotDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/RubberDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/RubberDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/SandboxTipsDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/SandboxTipsDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/SaveAsDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/SaveAsDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/ScriptDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/ScriptDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/SequencerDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/SequencerDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/Settings.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/Settings.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/SettingsDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/SettingsDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/Sfx2Dialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/Sfx2Dialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/SfxDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/SfxDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/ShapeExtruderDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/ShapeExtruderDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/SoundManDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/SoundManDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/StickyDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/StickyDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/SynthesizerDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/SynthesizerDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/TimerDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/TimerDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/ToolDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/ToolDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/TouchFieldDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/TouchFieldDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/TwoWayHashmap.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/TwoWayHashmap.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/VariableDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/VariableDialog.java
--- a/build-android/principia/src/main/java/com/bithack/principia/shared/VendorDialog.java
+++ b/build-android/principia/src/main/java/com/bithack/principia/shared/VendorDialog.java
--- a/build-android/principia/src/main/java/org/libsdl/app/HIDDevice.java
+++ b/build-android/principia/src/main/java/org/libsdl/app/HIDDevice.java
--- a/build-android/principia/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java
+++ b/build-android/principia/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java
--- a/build-android/principia/src/main/java/org/libsdl/app/HIDDeviceManager.java
+++ b/build-android/principia/src/main/java/org/libsdl/app/HIDDeviceManager.java
--- a/build-android/principia/src/main/java/org/libsdl/app/HIDDeviceUSB.java
+++ b/build-android/principia/src/main/java/org/libsdl/app/HIDDeviceUSB.java
--- a/build-android/principia/src/main/java/org/libsdl/app/PrincipiaBackend.java
+++ b/build-android/principia/src/main/java/org/libsdl/app/PrincipiaBackend.java
--- a/build-android/principia/src/main/java/org/libsdl/app/SDL.java
+++ b/build-android/principia/src/main/java/org/libsdl/app/SDL.java
--- a/build-android/principia/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/build-android/principia/src/main/java/org/libsdl/app/SDLActivity.java
--- a/build-android/principia/src/main/java/org/libsdl/app/SDLAudioManager.java
+++ b/build-android/principia/src/main/java/org/libsdl/app/SDLAudioManager.java
--- a/build-android/principia/src/main/java/org/libsdl/app/SDLControllerManager.java
+++ b/build-android/principia/src/main/java/org/libsdl/app/SDLControllerManager.java
--- a/build-android/principia/src/main/java/org/libsdl/app/SDLSurface.java
+++ b/build-android/principia/src/main/java/org/libsdl/app/SDLSurface.java
--- a/build-android/principia/src/main/res/anim/enter.xml
+++ b/build-android/principia/src/main/res/anim/enter.xml
--- a/build-android/principia/src/main/res/anim/exit.xml
+++ b/build-android/principia/src/main/res/anim/exit.xml
--- a/build-android/principia/src/main/res/drawable-hdpi/icon.png
+++ b/build-android/principia/src/main/res/drawable-hdpi/icon.png
--- a/build-android/principia/src/main/res/drawable-hdpi/seek_thumb_normal.png
+++ b/build-android/principia/src/main/res/drawable-hdpi/seek_thumb_normal.png
--- a/build-android/principia/src/main/res/drawable-hdpi/seek_thumb_pressed.png
+++ b/build-android/principia/src/main/res/drawable-hdpi/seek_thumb_pressed.png
--- a/build-android/principia/src/main/res/drawable-ldpi/icon.png
+++ b/build-android/principia/src/main/res/drawable-ldpi/icon.png
--- a/build-android/principia/src/main/res/drawable-mdpi/icon.png
+++ b/build-android/principia/src/main/res/drawable-mdpi/icon.png
--- a/build-android/principia/src/main/res/drawable-mdpi/seek_thumb_normal.png
+++ b/build-android/principia/src/main/res/drawable-mdpi/seek_thumb_normal.png
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`Subproject commit 855bd88ce3a46cc06de1d113565d0a0ae19e219d`