Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds more sounds #305

Merged
merged 21 commits into from
Sep 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
02436d9
Add water_hitting & water_hose sounds
hitshydev May 8, 2020
2a3c756
Add new sounds to credits
hitshydev May 8, 2020
0449bcd
Rename to hosing
hitshydev May 8, 2020
02ee5ea
chore(git): merge branch 'ashutoshgngwr/master' into PR #157
ashutoshgngwr May 10, 2020
8de5f5e
feat(app): add public library sound
ashutoshgngwr Aug 21, 2020
ba1a1fe
chore(git): merge branch 'ashutoshgngwr/feat/more-sounds' into PR #157
ashutoshgngwr Aug 21, 2020
0350b49
refactor(app): split water hose into 2 samples, remove hosing sound
ashutoshgngwr Aug 21, 2020
9a864c4
Merge pull request #157 from hitshydev/master
ashutoshgngwr Aug 21, 2020
8d7dd5f
feat(app): add crickets sound
ashutoshgngwr Aug 22, 2020
28add13
feat(app): add electric car sound
ashutoshgngwr Aug 30, 2020
47b3e10
feat(app): add human heartbeat sound
ashutoshgngwr Aug 30, 2020
ad9424b
feat(app): add creaking ship sound
ashutoshgngwr Aug 30, 2020
6c04018
feat(app): add walking through the snow sound
ashutoshgngwr Aug 30, 2020
7b673bb
feat(app): add screeching seagulls sound
ashutoshgngwr Aug 31, 2020
5a59ce4
feat(app): add howling wolf sound
ashutoshgngwr Aug 31, 2020
0812ac0
feat(app): add purring cat sound
ashutoshgngwr Aug 31, 2020
e1c4b94
refactor(app): move sound credits from AboutFragment to Sound
ashutoshgngwr Aug 31, 2020
17592e5
feat(app): add quiet conversation sound
ashutoshgngwr Aug 31, 2020
06d211c
fix(app): fix coffee shop sound
ashutoshgngwr Aug 31, 2020
06c999c
fix(app): fix birds sound
ashutoshgngwr Aug 31, 2020
8ec388c
refactor(app): remove obsolete sound categories
ashutoshgngwr Aug 31, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed app/src/main/assets/birds.mp3
Binary file not shown.
Binary file added app/src/main/assets/birds_0.mp3
Binary file not shown.
Binary file added app/src/main/assets/birds_1.mp3
Binary file not shown.
Binary file modified app/src/main/assets/coffee_shop_0.mp3
Binary file not shown.
Binary file modified app/src/main/assets/coffee_shop_1.mp3
Binary file not shown.
Binary file added app/src/main/assets/creaking_ship_0.mp3
Binary file not shown.
Binary file added app/src/main/assets/creaking_ship_1.mp3
Binary file not shown.
Binary file added app/src/main/assets/crickets_0.mp3
Binary file not shown.
Binary file added app/src/main/assets/crickets_1.mp3
Binary file not shown.
Binary file added app/src/main/assets/electric_car_0.mp3
Binary file not shown.
Binary file added app/src/main/assets/electric_car_1.mp3
Binary file not shown.
Binary file added app/src/main/assets/howling_wolf.mp3
Binary file not shown.
Binary file added app/src/main/assets/human_heartbeat.mp3
Binary file not shown.
Binary file added app/src/main/assets/public_library_0.mp3
Binary file not shown.
Binary file added app/src/main/assets/public_library_1.mp3
Binary file not shown.
Binary file added app/src/main/assets/purring_cat.mp3
Binary file not shown.
Binary file added app/src/main/assets/quiet_conversation_0.mp3
Binary file not shown.
Binary file added app/src/main/assets/quiet_conversation_1.mp3
Binary file not shown.
Binary file added app/src/main/assets/screeching_seagulls.mp3
Binary file not shown.
Binary file added app/src/main/assets/walking_through_the_snow.mp3
Binary file not shown.
Binary file added app/src/main/assets/water_hose_0.mp3
Binary file not shown.
Binary file added app/src/main/assets/water_hose_1.mp3
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import com.github.ashutoshgngwr.noice.BuildConfig
import com.github.ashutoshgngwr.noice.R
import com.github.ashutoshgngwr.noice.sound.Sound
import mehdi.sakout.aboutpage.AboutPage
import mehdi.sakout.aboutpage.Element

class AboutFragment : Fragment() {

companion object {
private val CREDITS = arrayOf(
private val OTHER_CREDITS = arrayOf(
arrayOf(
R.string.credits__app_icon,
R.drawable.ic_launcher_24dp,
Expand All @@ -25,111 +26,6 @@ class AboutFragment : Fragment() {
R.string.credits__support_development_icon,
R.drawable.ic_nav_support_development,
R.string.credits__support_development_icon_url
),
arrayOf(
R.string.credits__sound_airplane_inflight,
R.drawable.ic_about_sound,
R.string.credits__sound_airplane_inflight_url
),
arrayOf(
R.string.credits__sound_airplane_seatbelt_beeps,
R.drawable.ic_about_sound,
R.string.credits__sound_airplane_seatbelt_beeps_url
),
arrayOf(
R.string.credits__sound_birds,
R.drawable.ic_about_sound,
R.string.credits__sound_birds_url
),
arrayOf(
R.string.credits__sound_bonfire,
R.drawable.ic_about_sound,
R.string.credits__sound_bonfire_url
),
arrayOf(
R.string.credits__sound_coffee_shop,
R.drawable.ic_about_sound,
R.string.credits__sound_coffee_shop_url
),
arrayOf(
R.string.credits__sound_distant_thunder,
R.drawable.ic_about_sound,
R.string.credits__sound_distant_thunder_url
),
arrayOf(
R.string.credits__sound_heavy_rain,
R.drawable.ic_about_sound,
R.string.credits__sound_heavy_rain_url
),
arrayOf(
R.string.credits__sound_light_rain,
R.drawable.ic_about_sound,
R.string.credits__sound_light_rain_url
),
arrayOf(
R.string.credits__sound_moderate_rain,
R.drawable.ic_about_sound,
R.string.credits__sound_moderate_rain_url
),
arrayOf(
R.string.credits__morning_in_a_village,
R.drawable.ic_about_sound,
R.string.credits__morning_in_a_village_url
),
arrayOf(
R.string.credits__sound_moving_train,
R.drawable.ic_about_sound,
R.string.credits__sound_moving_train_url
),
arrayOf(
R.string.credits__sound_night,
R.drawable.ic_about_sound,
R.string.credits__sound_night_url
),
arrayOf(
R.string.credits__sound_office,
R.drawable.ic_about_sound,
R.string.credits__sound_office_url
),
arrayOf(
R.string.credits__sound_rolling_thunder,
R.drawable.ic_about_sound,
R.string.credits__sound_rolling_thunder_url
),
arrayOf(
R.string.credits__sound_seaside,
R.drawable.ic_about_sound,
R.string.credits__sound_seaside_url
),
arrayOf(
R.string.credits__sound_soft_wind,
R.drawable.ic_about_sound,
R.string.credits__sound_soft_wind_url
),
arrayOf(
R.string.credits__sound_thunder_crack,
R.drawable.ic_about_sound,
R.string.credits__sound_thunder_crack_url
),
arrayOf(
R.string.credits__sound_train_horn,
R.drawable.ic_about_sound,
R.string.credits__sound_train_horn_url
),
arrayOf(
R.string.credits__sound_water_stream,
R.drawable.ic_about_sound,
R.string.credits__sound_water_stream_url
),
arrayOf(
R.string.credits__sound_wind_chimes_of_shells,
R.drawable.ic_about_sound,
R.string.credits__sound_wind_chimes_of_shells_url
),
arrayOf(
R.string.credits__sound_wind_in_palm_trees,
R.drawable.ic_about_sound,
R.string.credits__sound_wind_in_palm_trees_url
)
)

Expand Down Expand Up @@ -222,10 +118,16 @@ class AboutFragment : Fragment() {
}

addGroup(getString(R.string.credits))
for (item in CREDITS) {
for (item in OTHER_CREDITS) {
addItem(createElement(item[0], item[1], item[2]))
}

for (sound in Sound.LIBRARY.values) {
for ((titleResID, urlResID) in sound.credits) {
addItem(createElement(titleResID, R.drawable.ic_about_sound, urlResID))
}
}

create()
}
}
Expand Down
Loading