Merge pull request #159 from OSLL/Alex0

SOUNDS ADDED
OSLL · Apr 22, 2022 · 32f014a · 32f014a
2 parents 04e44c2 + d599305
commit 32f014a
Show file tree

Hide file tree

Showing 88 changed files with 35 additions and 10 deletions.
diff --git a/app/src/main/java/com/bigri239/easymusic/AddingfilesActivity.kt b/app/src/main/java/com/bigri239/easymusic/AddingfilesActivity.kt
@@ -26,10 +26,23 @@ class AddingfilesActivity : AppCompatActivity() {
     private var id = 0
     private var len : Long = 3615
     private var track = SoundPool(1, AudioManager.STREAM_MUSIC, 0)
-    private val defaultList : ArrayList<String> = arrayListOf("bassalbane", "basscentury", "bassflowers",
-        "clapchoppa", "clapforeign", "crashalect", "crashbloods", "crashvinnyx", "fxfreeze",
-        "fxgunnes", "hihatcheque", "hihatmystery", "kickartillery", "kickinfinite", "percardonme",
-        "percpaolla", "rimchaser", "rimstount", "snarecompas", "snarewoods", "voxanother", "voxgilens")
+    private val defaultList : ArrayList<String> = arrayListOf("aaf", "abandana", "abig", "ablockboy",
+        "afendi", "alongmoney", "anotavalible", "apluggirl", "apunch", "ashawty", "ashotta",
+        "asnake", "aspirit", "awork", "bassalbane", "basscentury", "bassflowers", "clapaf",
+        "clapchoppa", "clapcrazy", "clapflip", "clapforeign", "clapjuice", "clapple", "claprev",
+        "clapslime", "clapsoda", "clapspace", "crashalect", "crashbloods", "crashvinnyx",
+        "cymbalaf", "cymbalblockboy", "cymbalblueface", "cymbalglasses", "cymbalhoodfight",
+        "cymbalpancake", "fxcillbill", "fxcrashsiren", "fxcup", "fxfreeze", "fxgotcash",
+        "fxguncock", "fxgunnes", "fxmario", "fxnoisefall", "fxple", "fxrace", "fxscratch",
+        "fxshots", "hhbigmoney", "hhgang", "hhgotit", "hhhood", "hhple", "hhpunch", "hhshawty",
+        "hhsnake", "hhsoft", "hhspace", "hihatcheque", "hihatmystery", "kickaf", "kickartillery",
+        "kickflip", "kickhood", "kickinfinite", "kickjordan", "kickpunch", "kickslap", "ohaf",
+        "ohbandana", "ohblockboy", "ohkiss", "ohlow", "ohog", "ohstick", "ohwork", "percaf",
+        "percardonme", "percblockboy", "percgame", "percgoofy", "percicy", "perclame",
+        "percnotavalible", "percoldchair", "percpaolla", "percpegas", "percple", "percroll",
+        "percrun", "percset", "percslime", "percwoodtoy", "rimchaser", "rimstount", "snareaf",
+        "snareblockboy", "snarechop", "snarecompas", "snarehood", "snareshawty", "snareslime",
+        "snaretango", "snarewoods", "voxanother", "voxgilens")
     private val customList = arrayListOf<String>()
     private lateinit var defaultAdapter: CustomAdapter
     private lateinit var customAdapter: CustomAdapter
@@ -142,7 +155,7 @@ class AddingfilesActivity : AppCompatActivity() {
             }
             else metaRetriever.setDataSource(File(filesDir, "$name.wav").absolutePath)
             abs(metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)!!.
-            toLong() - 1)
+                toLong() - 1)
         }
         catch (e: Exception) {
             0

diff --git a/app/src/main/java/com/bigri239/easymusic/MainActivity.kt b/app/src/main/java/com/bigri239/easymusic/MainActivity.kt
@@ -63,11 +63,23 @@ open class MainActivity : AppCompatActivity(){
     private var maxSounds: Array<Int> = Array(9) { -1 }
     private val emptySound = SoundInfo()
     private var sounds: Array<Array<SoundInfo>> = Array(9) { Array(1000) { emptySound } }
-    private val resourcesArray : Array<String> = arrayOf("bassalbane", "basscentury", "bassflowers",
-        "clapchoppa", "clapforeign", "crashalect", "crashbloods", "crashvinnyx", "fxfreeze",
-        "fxgunnes", "hihatcheque", "hihatmystery", "kickartillery", "kickinfinite", "percardonme",
-        "percpaolla", "rimchaser", "rimstount", "snarecompas", "snarewoods", "voxanother",
-        "voxgilens")
+    private val resourcesArray : Array<String> = arrayOf("aaf", "abandana", "abig", "ablockboy",
+        "afendi", "alongmoney", "anotavalible", "apluggirl", "apunch", "ashawty", "ashotta",
+        "asnake", "aspirit", "awork", "bassalbane", "basscentury", "bassflowers", "clapaf",
+        "clapchoppa", "clapcrazy", "clapflip", "clapforeign", "clapjuice", "clapple", "claprev",
+        "clapslime", "clapsoda", "clapspace", "crashalect", "crashbloods", "crashvinnyx",
+        "cymbalaf", "cymbalblockboy", "cymbalblueface", "cymbalglasses", "cymbalhoodfight",
+        "cymbalpancake", "fxcillbill", "fxcrashsiren", "fxcup", "fxfreeze", "fxgotcash",
+        "fxguncock", "fxgunnes", "fxmario", "fxnoisefall", "fxple", "fxrace", "fxscratch",
+        "fxshots", "hhbigmoney", "hhgang", "hhgotit", "hhhood", "hhple", "hhpunch", "hhshawty",
+        "hhsnake", "hhsoft", "hhspace", "hihatcheque", "hihatmystery", "kickaf", "kickartillery",
+        "kickflip", "kickhood", "kickinfinite", "kickjordan", "kickpunch", "kickslap", "ohaf",
+        "ohbandana", "ohblockboy", "ohkiss", "ohlow", "ohog", "ohstick", "ohwork", "percaf",
+        "percardonme", "percblockboy", "percgame", "percgoofy", "percicy", "perclame",
+        "percnotavalible", "percoldchair", "percpaolla", "percpegas", "percple", "percroll",
+        "percrun", "percset", "percslime", "percwoodtoy", "rimchaser", "rimstount", "snareaf",
+        "snareblockboy", "snarechop", "snarecompas", "snarehood", "snareshawty", "snareslime",
+        "snaretango", "snarewoods", "voxanother", "voxgilens")
     private val customArray = arrayListOf<String>()
     private var timer : CountDownTimer? = null
     private lateinit var autoSaver : CountDownTimer

diff --git a/app/src/main/res/raw/ClapCrazy.wav b/app/src/main/res/raw/ClapCrazy.wav
diff --git a/app/src/main/res/raw/ClapFlip.wav b/app/src/main/res/raw/ClapFlip.wav
diff --git a/app/src/main/res/raw/ClapJuice.wav b/app/src/main/res/raw/ClapJuice.wav
diff --git a/app/src/main/res/raw/ClapPLE.wav b/app/src/main/res/raw/ClapPLE.wav
diff --git a/app/src/main/res/raw/ClapRev.wav b/app/src/main/res/raw/ClapRev.wav
diff --git a/app/src/main/res/raw/ClapSlime.wav b/app/src/main/res/raw/ClapSlime.wav
diff --git a/app/src/main/res/raw/ClapSoda.wav b/app/src/main/res/raw/ClapSoda.wav
diff --git a/app/src/main/res/raw/ClapSpace.wav b/app/src/main/res/raw/ClapSpace.wav
diff --git a/app/src/main/res/raw/CymbalBlockBoy.wav b/app/src/main/res/raw/CymbalBlockBoy.wav
diff --git a/app/src/main/res/raw/CymbalGlasses.wav b/app/src/main/res/raw/CymbalGlasses.wav
diff --git a/app/src/main/res/raw/CymbalHoodFight.wav b/app/src/main/res/raw/CymbalHoodFight.wav
diff --git a/app/src/main/res/raw/CymbalPANcake.wav b/app/src/main/res/raw/CymbalPANcake.wav
diff --git a/app/src/main/res/raw/FXCrashSiren.wav b/app/src/main/res/raw/FXCrashSiren.wav
diff --git a/app/src/main/res/raw/FXNoiseFall.wav b/app/src/main/res/raw/FXNoiseFall.wav
diff --git a/app/src/main/res/raw/FXPLE.wav b/app/src/main/res/raw/FXPLE.wav
diff --git a/app/src/main/res/raw/FXRace.wav b/app/src/main/res/raw/FXRace.wav
diff --git a/app/src/main/res/raw/FXScratch.wav b/app/src/main/res/raw/FXScratch.wav
diff --git a/app/src/main/res/raw/FXShots.wav b/app/src/main/res/raw/FXShots.wav
diff --git a/app/src/main/res/raw/FxMario.wav b/app/src/main/res/raw/FxMario.wav
diff --git a/app/src/main/res/raw/HHBigMoney.wav b/app/src/main/res/raw/HHBigMoney.wav
diff --git a/app/src/main/res/raw/HHGang.wav b/app/src/main/res/raw/HHGang.wav
diff --git a/app/src/main/res/raw/HHGotIt.wav b/app/src/main/res/raw/HHGotIt.wav
diff --git a/app/src/main/res/raw/HHPLE.wav b/app/src/main/res/raw/HHPLE.wav
diff --git a/app/src/main/res/raw/HHPunch.wav b/app/src/main/res/raw/HHPunch.wav
diff --git a/app/src/main/res/raw/HHShawty.wav b/app/src/main/res/raw/HHShawty.wav
diff --git a/app/src/main/res/raw/HHSnake.wav b/app/src/main/res/raw/HHSnake.wav
diff --git a/app/src/main/res/raw/HHSoft.wav b/app/src/main/res/raw/HHSoft.wav
diff --git a/app/src/main/res/raw/HHSpace.wav b/app/src/main/res/raw/HHSpace.wav
diff --git a/app/src/main/res/raw/KickFlip.wav b/app/src/main/res/raw/KickFlip.wav
diff --git a/app/src/main/res/raw/KickHood.wav b/app/src/main/res/raw/KickHood.wav
diff --git a/app/src/main/res/raw/KickJordan.wav b/app/src/main/res/raw/KickJordan.wav
diff --git a/app/src/main/res/raw/KickPunch.wav b/app/src/main/res/raw/KickPunch.wav
diff --git a/app/src/main/res/raw/KickSlap.wav b/app/src/main/res/raw/KickSlap.wav
diff --git a/app/src/main/res/raw/OHBandana.wav b/app/src/main/res/raw/OHBandana.wav
diff --git a/app/src/main/res/raw/OHBlockBoy.wav b/app/src/main/res/raw/OHBlockBoy.wav
diff --git a/app/src/main/res/raw/OHKiss.wav b/app/src/main/res/raw/OHKiss.wav
diff --git a/app/src/main/res/raw/OHLow.wav b/app/src/main/res/raw/OHLow.wav
diff --git a/app/src/main/res/raw/OHOG.wav b/app/src/main/res/raw/OHOG.wav
diff --git a/app/src/main/res/raw/OHStick.wav b/app/src/main/res/raw/OHStick.wav
diff --git a/app/src/main/res/raw/OHWork.wav b/app/src/main/res/raw/OHWork.wav
diff --git a/app/src/main/res/raw/PercBlockBoy.wav b/app/src/main/res/raw/PercBlockBoy.wav
diff --git a/app/src/main/res/raw/PercGame.wav b/app/src/main/res/raw/PercGame.wav
diff --git a/app/src/main/res/raw/PercGoofy.wav b/app/src/main/res/raw/PercGoofy.wav
diff --git a/app/src/main/res/raw/PercIcy.wav b/app/src/main/res/raw/PercIcy.wav
diff --git a/app/src/main/res/raw/PercLame.wav b/app/src/main/res/raw/PercLame.wav
diff --git a/app/src/main/res/raw/PercNotAvalible.wav b/app/src/main/res/raw/PercNotAvalible.wav
diff --git a/app/src/main/res/raw/PercOldChair.wav b/app/src/main/res/raw/PercOldChair.wav
diff --git a/app/src/main/res/raw/PercPLE.wav b/app/src/main/res/raw/PercPLE.wav
diff --git a/app/src/main/res/raw/PercPegas.wav b/app/src/main/res/raw/PercPegas.wav
diff --git a/app/src/main/res/raw/PercRoll.wav b/app/src/main/res/raw/PercRoll.wav
diff --git a/app/src/main/res/raw/PercRun.wav b/app/src/main/res/raw/PercRun.wav
diff --git a/app/src/main/res/raw/PercSet.wav b/app/src/main/res/raw/PercSet.wav
diff --git a/app/src/main/res/raw/PercSlime.wav b/app/src/main/res/raw/PercSlime.wav
diff --git a/app/src/main/res/raw/PercWoodToy.wav b/app/src/main/res/raw/PercWoodToy.wav
diff --git a/app/src/main/res/raw/SnareBlockBoy.wav b/app/src/main/res/raw/SnareBlockBoy.wav
diff --git a/app/src/main/res/raw/SnareChop.wav b/app/src/main/res/raw/SnareChop.wav
diff --git a/app/src/main/res/raw/SnareHood.wav b/app/src/main/res/raw/SnareHood.wav
diff --git a/app/src/main/res/raw/SnareShawty.wav b/app/src/main/res/raw/SnareShawty.wav
diff --git a/app/src/main/res/raw/SnareSlime.wav b/app/src/main/res/raw/SnareSlime.wav
diff --git a/app/src/main/res/raw/SnareTango.wav b/app/src/main/res/raw/SnareTango.wav
diff --git a/app/src/main/res/raw/aaf.wav b/app/src/main/res/raw/aaf.wav
diff --git a/app/src/main/res/raw/abandana.wav b/app/src/main/res/raw/abandana.wav
diff --git a/app/src/main/res/raw/abig.wav b/app/src/main/res/raw/abig.wav
diff --git a/app/src/main/res/raw/ablockboy.wav b/app/src/main/res/raw/ablockboy.wav
diff --git a/app/src/main/res/raw/afendi.wav b/app/src/main/res/raw/afendi.wav
diff --git a/app/src/main/res/raw/alongmoney.wav b/app/src/main/res/raw/alongmoney.wav
diff --git a/app/src/main/res/raw/anotavalible.wav b/app/src/main/res/raw/anotavalible.wav
diff --git a/app/src/main/res/raw/apluggirl.wav b/app/src/main/res/raw/apluggirl.wav
diff --git a/app/src/main/res/raw/apunch.wav b/app/src/main/res/raw/apunch.wav
diff --git a/app/src/main/res/raw/ashawty.wav b/app/src/main/res/raw/ashawty.wav
diff --git a/app/src/main/res/raw/ashotta.wav b/app/src/main/res/raw/ashotta.wav
diff --git a/app/src/main/res/raw/asnake.wav b/app/src/main/res/raw/asnake.wav
diff --git a/app/src/main/res/raw/aspirit.wav b/app/src/main/res/raw/aspirit.wav
diff --git a/app/src/main/res/raw/awork.wav b/app/src/main/res/raw/awork.wav
diff --git a/app/src/main/res/raw/clapaf.wav b/app/src/main/res/raw/clapaf.wav
diff --git a/app/src/main/res/raw/cymbalaf.wav b/app/src/main/res/raw/cymbalaf.wav
diff --git a/app/src/main/res/raw/cymbalblueface.wav b/app/src/main/res/raw/cymbalblueface.wav
diff --git a/app/src/main/res/raw/fxcillbill.wav b/app/src/main/res/raw/fxcillbill.wav
diff --git a/app/src/main/res/raw/fxcup.wav b/app/src/main/res/raw/fxcup.wav
diff --git a/app/src/main/res/raw/fxgotcash.wav b/app/src/main/res/raw/fxgotcash.wav
diff --git a/app/src/main/res/raw/fxguncock.wav b/app/src/main/res/raw/fxguncock.wav
diff --git a/app/src/main/res/raw/hhhood.wav b/app/src/main/res/raw/hhhood.wav
diff --git a/app/src/main/res/raw/kickaf.wav b/app/src/main/res/raw/kickaf.wav
diff --git a/app/src/main/res/raw/ohaf.wav b/app/src/main/res/raw/ohaf.wav
diff --git a/app/src/main/res/raw/percaf.wav b/app/src/main/res/raw/percaf.wav
diff --git a/app/src/main/res/raw/snareaf.wav b/app/src/main/res/raw/snareaf.wav