Replace old audio visualizer #16
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,14 +4,13 @@ | |
| import android.content.Context; | ||
| import android.content.Intent; | ||
| import android.content.pm.PackageManager; | ||
| import android.graphics.Color; | ||
| import android.media.MediaPlayer; | ||
| import android.media.audiofx.BassBoost; | ||
| import android.media.audiofx.LoudnessEnhancer; | ||
| import android.os.Bundle; | ||
| import android.os.VibrationEffect; | ||
| import android.os.Vibrator; | ||
| import android.support.v4.app.ActivityCompat; | ||
| import android.support.v4.content.ContextCompat; | ||
| import android.util.Log; | ||
|
|
@@ -27,13 +26,13 @@ | |
| import android.widget.SeekBar; | ||
| import android.widget.Switch; | ||
| import android.widget.TextView; | ||
| import com.chibde.visualizer.BarVisualizer; | ||
|
|
||
|
|
||
| public class LiveWithSettings extends AppCompatActivity | ||
| implements NavigationView.OnNavigationItemSelectedListener { | ||
|
|
||
| private BarVisualizer barVisualizer; | ||
| private HapticFeedback hapticFeedback; | ||
| private MediaPlayer mAudioPlayer; | ||
| private Vibrator vibrator; | ||
|
|
@@ -215,47 +214,61 @@ private void requestVisualizerPermissions() { | |
| } | ||
|
|
||
| private void initializeVisualizerAndFeedback() { | ||
| hapticFeedback = initHapticFeedback(); | ||
|
|
||
| mAudioPlayer = MediaPlayer.create(this, recordedSongId); | ||
| Thread t = new Thread(hapticFeedback); | ||
| t.start(); | ||
| mAudioPlayer.start(); | ||
| initVisualizer(); | ||
| } | ||
|
|
||
| private void initVisualizer() { | ||
| barVisualizer = findViewById(R.id.visualizer); | ||
| //barVisualizer.setColor(Color.argb(1, Color.red(206), Color.green(66), Color.blue(244))); | ||
|
There was a problem hiding this comment. Let's go with rgb(219,24,103) for now! This is the theme pink (Dogwood Rose). Also, once we have some of the more structural things in place, it would be cool to address #4 by implementing some sort of gradient/color changing for this bar visualizer if all goes well! |
||
| barVisualizer.setDensity(40); | ||
| barVisualizer.setPlayer(mAudioPlayer.getAudioSessionId()); | ||
| } | ||
|
|
||
| private HapticFeedback initHapticFeedback() { | ||
| HapticFeedback songHapticFeedback = null; | ||
| switch (recordedSongId) { | ||
| case R.raw.croatian: | ||
| songHapticFeedback = new HapticFeedback(80,618); | ||
| break; | ||
| case R.raw.highscore: | ||
| songHapticFeedback = new HapticFeedback(100, 538); | ||
| break; | ||
| case R.raw.unity: | ||
| songHapticFeedback = new HapticFeedback(100, 555); | ||
| break; | ||
| case R.raw.christmas: | ||
| songHapticFeedback = new HapticFeedback(90, 530); | ||
| break; | ||
| case R.raw.grilboyfriend: | ||
| songHapticFeedback = new HapticFeedback(90, 520); | ||
| break; | ||
| case R.raw.forever: | ||
| songHapticFeedback = new HapticFeedback(100, 565); | ||
| break; | ||
| case R.raw.alreadygone: | ||
| songHapticFeedback = new HapticFeedback(100, 575); | ||
| break; | ||
| case R.raw.doesntmatter: | ||
| songHapticFeedback = new HapticFeedback(100, 600); | ||
| break; | ||
| case R.raw.walkaway: | ||
| songHapticFeedback = new HapticFeedback(100, 600); | ||
| break; | ||
| case R.raw.enen: | ||
| songHapticFeedback = new HapticFeedback(100, 620); | ||
| break; | ||
| default: | ||
| songHapticFeedback = null; | ||
| break; | ||
| } | ||
|
|
||
| return songHapticFeedback; | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -303,8 +316,6 @@ public boolean onNavigationItemSelected(MenuItem item) { | |
| @Override | ||
| protected void onDestroy() { | ||
| super.onDestroy(); | ||
| } | ||
|
|
||
| private class HapticFeedback implements Runnable { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! I like how this is much cleaner than before. good call!