From 830d5d0b48fe674844ec40a2ead3b1717dab756d Mon Sep 17 00:00:00 2001 From: Roberto Fuentes Date: Sat, 13 Mar 2021 19:20:09 +0100 Subject: [PATCH 1/5] fix(app): Added RandomPresetFragment.kt --- .../ashutoshgngwr/noice/MainActivity.kt | 2 ++ .../noice/fragment/RandomPresetFragment.kt | 22 +++++++++++++++++++ .../res/layout/random_preset_fragment.xml | 8 +++++++ app/src/main/res/menu/main.xml | 6 +++++ 4 files changed, 38 insertions(+) create mode 100644 app/src/main/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragment.kt create mode 100644 app/src/main/res/layout/random_preset_fragment.xml diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/MainActivity.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/MainActivity.kt index c3aed4c80..d5c1169b3 100644 --- a/app/src/main/java/com/github/ashutoshgngwr/noice/MainActivity.kt +++ b/app/src/main/java/com/github/ashutoshgngwr/noice/MainActivity.kt @@ -21,6 +21,7 @@ import com.github.ashutoshgngwr.noice.databinding.MainActivityBinding import com.github.ashutoshgngwr.noice.fragment.AboutFragment import com.github.ashutoshgngwr.noice.fragment.DialogFragment import com.github.ashutoshgngwr.noice.fragment.PresetFragment +import com.github.ashutoshgngwr.noice.fragment.RandomPresetFragment import com.github.ashutoshgngwr.noice.fragment.SleepTimerFragment import com.github.ashutoshgngwr.noice.fragment.SoundLibraryFragment import com.github.ashutoshgngwr.noice.fragment.SupportDevelopmentFragment @@ -55,6 +56,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte R.id.saved_presets to PresetFragment::class.java, R.id.sleep_timer to SleepTimerFragment::class.java, R.id.wake_up_timer to WakeUpTimerFragment::class.java, + R.id.random_preset to RandomPresetFragment::class.java, R.id.about to AboutFragment::class.java, R.id.support_development to SupportDevelopmentFragment::class.java ) diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragment.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragment.kt new file mode 100644 index 000000000..4e770016e --- /dev/null +++ b/app/src/main/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragment.kt @@ -0,0 +1,22 @@ +package com.github.ashutoshgngwr.noice.fragment + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.github.ashutoshgngwr.noice.R + +class RandomPresetFragment : Fragment() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.random_preset_fragment, container, false) + } +} diff --git a/app/src/main/res/layout/random_preset_fragment.xml b/app/src/main/res/layout/random_preset_fragment.xml new file mode 100644 index 000000000..6dbf77d8d --- /dev/null +++ b/app/src/main/res/layout/random_preset_fragment.xml @@ -0,0 +1,8 @@ + + + + diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 5622588ac..a3f74f0dd 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -25,6 +25,12 @@ android:title="@string/wake_up_timer" android:checkable="true" /> + + Date: Sat, 13 Mar 2021 19:54:04 +0100 Subject: [PATCH 2/5] feat(app): Added option to play random mode in a RandomPresetFragment.kt. --- .../noice/fragment/RandomPresetFragment.kt | 42 ++++++- .../res/layout/random_preset_fragment.xml | 117 ++++++++++++++++++ 2 files changed, 154 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragment.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragment.kt index 4e770016e..6587e8d57 100644 --- a/app/src/main/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragment.kt +++ b/app/src/main/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragment.kt @@ -5,18 +5,50 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Toast +import com.github.ashutoshgngwr.noice.MediaPlayerService import com.github.ashutoshgngwr.noice.R +import com.github.ashutoshgngwr.noice.databinding.RandomPresetFragmentBinding +import com.github.ashutoshgngwr.noice.sound.Sound class RandomPresetFragment : Fragment() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - } + private lateinit var binding: RandomPresetFragmentBinding override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { - return inflater.inflate(R.layout.random_preset_fragment, container, false) + ): View { + binding = RandomPresetFragmentBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + binding.playPresetButton.setOnClickListener { + val tag = when (binding.presetType.checkedRadioButtonId) { + R.id.preset_type__focus -> Sound.Tag.FOCUS + R.id.preset_type__relax -> Sound.Tag.RELAX + else -> null + } + + val intensity = when (binding.presetIntensity.checkedRadioButtonId) { + R.id.preset_intensity__light -> SoundLibraryFragment.RANGE_INTENSITY_LIGHT + R.id.preset_intensity__dense -> SoundLibraryFragment.RANGE_INTENSITY_DENSE + else -> SoundLibraryFragment.RANGE_INTENSITY_ANY + } + MediaPlayerService.playRandomPreset(requireContext(), tag, intensity) + //We'll add later a if player is playing then show else there was an error + Toast.makeText(requireContext(), "Playing Random!", Toast.LENGTH_SHORT).show() + + // Your choice to show up in-app review on this fragment! + // maybe show in-app review dialog to the user + //InAppReviewFlowManager.maybeAskForReview(requireActivity()) + } + + binding.cancelPresetButton.setOnClickListener { + //What do we do cancel? Should we reset preferences button? + } } } diff --git a/app/src/main/res/layout/random_preset_fragment.xml b/app/src/main/res/layout/random_preset_fragment.xml index 6dbf77d8d..d9783d399 100644 --- a/app/src/main/res/layout/random_preset_fragment.xml +++ b/app/src/main/res/layout/random_preset_fragment.xml @@ -3,6 +3,123 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".fragment.RandomPresetFragment"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +