move some android files around

2021-07-13 08:56:14 +09:30 · 2021-07-13 08:56:14 +09:30 · 070d9641db
parent fc996df8ec
commit 070d9641db
277 changed files with 12 additions and 7 deletions
--- a/Android/Script/buildAssets.cmd
+++ b/Android/Script/buildAssets.cmd
@ -8,24 +8,29 @@ set base_dir=%cd%
 cd /d %origdir%

 echo Building Lang files
-xcopy "%base_dir%/Lang" "%base_dir%/Android/assets/project64_data/Lang/" /D /I /F /Y /E
+xcopy "%base_dir%/Lang" "%base_dir%/Android/app/src/main/assets/project64_data/Lang/" /D /I /F /Y /E
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)

 echo Copy config files
-IF NOT EXIST "%base_dir%/Android/assets/project64_data/Config/" mkdir "%base_dir%/Android/assets/project64_data/Config/"
-copy "%base_dir%\Config\Audio.rdb" "%base_dir%\Android\assets\project64_data\Config\"
+IF NOT EXIST "%base_dir%/Android/app/src/main/assets/project64_data/Config/" mkdir "%base_dir%/Android/app/src/main/assets/project64_data/Config/"
+copy "%base_dir%\Config\Audio.rdb" "%base_dir%\Android\app\src\main\assets\project64_data\Config\"
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)

-copy "%base_dir%\Config\Video.rdb" "%base_dir%\Android\assets\project64_data\Config\"
+copy "%base_dir%\Config\Video.rdb" "%base_dir%\Android\app\src\main\assets\project64_data\Config\"
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)

-copy "%base_dir%\Config\Project64.cht" "%base_dir%\Android\assets\project64_data\Config\"
+copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Android\app\src\main\assets\project64_data\Config\"
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)

-copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Android\assets\project64_data\Config\"
+copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Android\app\src\main\assets\project64_data\Config\"
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)

-copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Android\assets\project64_data\Config\"
+IF NOT EXIST "%base_dir%/Android/app/src/main/assets/project64_data/Config/Cheats/" mkdir "%base_dir%/Android/app/src/main/assets/project64_data/Config/Cheats/"
+xcopy "%base_dir%/Config/Cheats" "%base_dir%/Android/app/src/main/assets/project64_data/Config/Cheats/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+IF NOT EXIST "%base_dir%/Android/app/src/main/assets/project64_data/Config/Enhancement/" mkdir "%base_dir%/Android/app/src/main/assets/project64_data/Config/Enhancement/"
+xcopy "%base_dir%/Config/Enhancement" "%base_dir%/Android/app/src/main/assets/project64_data/Config/Enhancement/" /D /I /F /Y /E
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)

 goto :end
--- a/Android/app/src/main/AndroidManifest.xml
+++ b/Android/app/src/main/AndroidManifest.xml
--- a/Android/app/src/main/assets/licence.htm
+++ b/Android/app/src/main/assets/licence.htm
--- a/Android/app/src/main/assets/loading.htm
+++ b/Android/app/src/main/assets/loading.htm
--- a/Android/app/src/main/assets/project64_data/profiles/touchscreen.cfg
+++ b/Android/app/src/main/assets/project64_data/profiles/touchscreen.cfg
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/.nomedia
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/.nomedia
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog-back.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog-back.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog-fore.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog-fore.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL-holdL.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL-holdL.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR-holdR.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR-holdR.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS-holdS.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS-holdS.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ-holdZ.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ-holdZ.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/dpad-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/dpad-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/dpad.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/dpad.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-holdA.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-holdA.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-holdB.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-holdB.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCd.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCd.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCl.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCl.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCr.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCr.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCu.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCu.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/skin.ini
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/skin.ini
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/.nomedia
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/.nomedia
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog-back.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog-back.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog-fore.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog-fore.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL-holdL.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL-holdL.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR-holdR.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR-holdR.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS-holdS.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS-holdS.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ-holdZ.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ-holdZ.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/dpad-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/dpad-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/dpad.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/dpad.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdA.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdA.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdB.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdB.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCd.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCd.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCl.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCl.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCr.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCr.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCu.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCu.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-mask.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-mask.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC.png
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC.png
--- a/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/skin.ini
+++ b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/skin.ini
--- a/Android/app/src/main/java/com/android/vending/billing/IInAppBillingService.aidl
+++ b/Android/app/src/main/java/com/android/vending/billing/IInAppBillingService.aidl
--- a/Android/app/src/main/java/emu/project64/AboutActivity.java
+++ b/Android/app/src/main/java/emu/project64/AboutActivity.java
--- a/Android/app/src/main/java/emu/project64/AboutPagerAdapter.java
+++ b/Android/app/src/main/java/emu/project64/AboutPagerAdapter.java
--- a/Android/app/src/main/java/emu/project64/AndroidDevice.java
+++ b/Android/app/src/main/java/emu/project64/AndroidDevice.java
--- a/Android/app/src/main/java/emu/project64/GalleryActivity.java
+++ b/Android/app/src/main/java/emu/project64/GalleryActivity.java
--- a/Android/app/src/main/java/emu/project64/GalleryItem.java
+++ b/Android/app/src/main/java/emu/project64/GalleryItem.java
--- a/Android/app/src/main/java/emu/project64/MenuListView.java
+++ b/Android/app/src/main/java/emu/project64/MenuListView.java
--- a/Android/app/src/main/java/emu/project64/Project64Application.java
+++ b/Android/app/src/main/java/emu/project64/Project64Application.java
--- a/Android/app/src/main/java/emu/project64/ScanRomsActivity.java
+++ b/Android/app/src/main/java/emu/project64/ScanRomsActivity.java
--- a/Android/app/src/main/java/emu/project64/SplashActivity.java
+++ b/Android/app/src/main/java/emu/project64/SplashActivity.java
--- a/Android/app/src/main/java/emu/project64/compat/AppCompatPreferenceActivity.java
+++ b/Android/app/src/main/java/emu/project64/compat/AppCompatPreferenceActivity.java
--- a/Android/app/src/main/java/emu/project64/dialog/ProgressDialog.java
+++ b/Android/app/src/main/java/emu/project64/dialog/ProgressDialog.java
--- a/Android/app/src/main/java/emu/project64/game/GameActivity.java
+++ b/Android/app/src/main/java/emu/project64/game/GameActivity.java
--- a/Android/app/src/main/java/emu/project64/game/GameActivityXperiaPlay.java
+++ b/Android/app/src/main/java/emu/project64/game/GameActivityXperiaPlay.java
--- a/Android/app/src/main/java/emu/project64/game/GameLifecycleHandler.java
+++ b/Android/app/src/main/java/emu/project64/game/GameLifecycleHandler.java
--- a/Android/app/src/main/java/emu/project64/game/GameMenuHandler.java
+++ b/Android/app/src/main/java/emu/project64/game/GameMenuHandler.java
--- a/Android/app/src/main/java/emu/project64/game/GameOverlay.java
+++ b/Android/app/src/main/java/emu/project64/game/GameOverlay.java
--- a/Android/app/src/main/java/emu/project64/game/GameSurface.java
+++ b/Android/app/src/main/java/emu/project64/game/GameSurface.java
--- a/Android/app/src/main/java/emu/project64/hack/MogaHack.java
+++ b/Android/app/src/main/java/emu/project64/hack/MogaHack.java
--- a/Android/app/src/main/java/emu/project64/inAppPurchase/IabBroadcastReceiver.java
+++ b/Android/app/src/main/java/emu/project64/inAppPurchase/IabBroadcastReceiver.java
--- a/Android/app/src/main/java/emu/project64/inAppPurchase/IabException.java
+++ b/Android/app/src/main/java/emu/project64/inAppPurchase/IabException.java
--- a/Android/app/src/main/java/emu/project64/inAppPurchase/IabHelper.java
+++ b/Android/app/src/main/java/emu/project64/inAppPurchase/IabHelper.java
--- a/Android/app/src/main/java/emu/project64/inAppPurchase/IabResult.java
+++ b/Android/app/src/main/java/emu/project64/inAppPurchase/IabResult.java
--- a/Android/app/src/main/java/emu/project64/inAppPurchase/Inventory.java
+++ b/Android/app/src/main/java/emu/project64/inAppPurchase/Inventory.java
--- a/Android/app/src/main/java/emu/project64/inAppPurchase/Purchase.java
+++ b/Android/app/src/main/java/emu/project64/inAppPurchase/Purchase.java
--- a/Android/app/src/main/java/emu/project64/inAppPurchase/Security.java
+++ b/Android/app/src/main/java/emu/project64/inAppPurchase/Security.java
--- a/Android/app/src/main/java/emu/project64/inAppPurchase/SkuDetails.java
+++ b/Android/app/src/main/java/emu/project64/inAppPurchase/SkuDetails.java
--- a/Android/app/src/main/java/emu/project64/input/AbstractController.java
+++ b/Android/app/src/main/java/emu/project64/input/AbstractController.java
--- a/Android/app/src/main/java/emu/project64/input/PeripheralController.java
+++ b/Android/app/src/main/java/emu/project64/input/PeripheralController.java
--- a/Android/app/src/main/java/emu/project64/input/TouchController.java
+++ b/Android/app/src/main/java/emu/project64/input/TouchController.java
--- a/Android/app/src/main/java/emu/project64/input/map/AxisMap.java
+++ b/Android/app/src/main/java/emu/project64/input/map/AxisMap.java
--- a/Android/app/src/main/java/emu/project64/input/map/InputMap.java
+++ b/Android/app/src/main/java/emu/project64/input/map/InputMap.java
--- a/Android/app/src/main/java/emu/project64/input/map/SerializableMap.java
+++ b/Android/app/src/main/java/emu/project64/input/map/SerializableMap.java
--- a/Android/app/src/main/java/emu/project64/input/map/TouchMap.java
+++ b/Android/app/src/main/java/emu/project64/input/map/TouchMap.java
--- a/Android/app/src/main/java/emu/project64/input/map/VisibleTouchMap.java
+++ b/Android/app/src/main/java/emu/project64/input/map/VisibleTouchMap.java
--- a/Android/app/src/main/java/emu/project64/input/provider/AbstractProvider.java
+++ b/Android/app/src/main/java/emu/project64/input/provider/AbstractProvider.java
--- a/Android/app/src/main/java/emu/project64/input/provider/AxisProvider.java
+++ b/Android/app/src/main/java/emu/project64/input/provider/AxisProvider.java
--- a/Show More
+++ b/Show More