Merge pull request #24 from brarcher/new-sounds

Add new water sounds and a fan sound
brarcher · Aug 29, 2016 · 6420da3 · 6420da3
2 parents d2708c2 + 38ee2ed
commit 6420da3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -41,9 +41,12 @@ and are distributed under the CC BY-NC-SA 3.0 License:
 The following sound resources were created by [MC2Method.org](http://mc2method.org/white-noise/)
 and are distributed under the condition of "Personal Use":
   - dryer.mp3
+  - fan.mp3
   - ocean.mp3
   - rain.mp3
   - refrigerator.mp3
+  - shower.mp3
+  - stream.mp3
   - vacuum.mp3
   - water.mp3
   - waterfall.mp3

diff --git a/app/src/main/java/protect/babysleepsounds/MainActivity.java b/app/src/main/java/protect/babysleepsounds/MainActivity.java
@@ -74,9 +74,12 @@ protected void onCreate(Bundle savedInstanceState)
         // mp3 file, 128kbps, stereo
         _soundMap = ImmutableMap.<String, Integer>builder()
             .put(getResources().getString(R.string.dryer), R.raw.dryer)
+            .put(getResources().getString(R.string.fan), R.raw.fan)
             .put(getResources().getString(R.string.ocean), R.raw.ocean)
             .put(getResources().getString(R.string.rain), R.raw.rain)
             .put(getResources().getString(R.string.refrigerator), R.raw.refrigerator)
+            .put(getResources().getString(R.string.shower), R.raw.shower)
+            .put(getResources().getString(R.string.stream), R.raw.stream)
             .put(getResources().getString(R.string.vacuum), R.raw.vacuum)
             .put(getResources().getString(R.string.water), R.raw.water)
             .put(getResources().getString(R.string.waterfall), R.raw.waterfall)

diff --git a/app/src/main/res/raw/fan.mp3 b/app/src/main/res/raw/fan.mp3
diff --git a/app/src/main/res/raw/shower.mp3 b/app/src/main/res/raw/shower.mp3
diff --git a/app/src/main/res/raw/stream.mp3 b/app/src/main/res/raw/stream.mp3
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -20,9 +20,12 @@
     <string name="time_8hour">8 Hours</string>
 
     <string name="dryer">Dryer</string>
+    <string name="fan">Fan</string>
     <string name="ocean">Ocean</string>
     <string name="rain">Rain</string>
     <string name="refrigerator">Refrigerator</string>
+    <string name="shower">Shower</string>
+    <string name="stream">Stream</string>
     <string name="vacuum">Vacuum</string>
     <string name="water">Water</string>
     <string name="waterfall">Waterfall</string>