Fixes #3 and Adds Equalizer

harjot-oberai · May 22, 2016 · be5d49d · be5d49d
1 parent 11633f2
commit be5d49d
Show file tree

Hide file tree

Showing 9 changed files with 289 additions and 74 deletions.
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.sdsmdg.harjot.MusicDNA"
         minSdkVersion 19
         targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "0.5.0"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/sdsmdg/harjot/MusicDNA/EqualizerFragment.java b/app/src/main/java/com/sdsmdg/harjot/MusicDNA/EqualizerFragment.java
@@ -3,11 +3,18 @@
 
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
 import android.os.Bundle;
 import android.app.Fragment;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ActionMenuView;
+import android.widget.LinearLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
 
 import com.db.chart.model.LineSet;
 import com.db.chart.view.AxisController;
@@ -30,12 +37,15 @@ public class EqualizerFragment extends Fragment {
     LineSet dataset;
     LineChartView chart;
     Paint paint;
+    float[] points;
+
+    short numberOfFrequencyBands;
+    LinearLayout mLinearLayout;
 
     public EqualizerFragment() {
         // Required empty public constructor
     }
 
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -47,33 +57,122 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        paint = new Paint();
-        paint.setColor(Color.parseColor("#777777"));
         chart = (LineChartView) view.findViewById(R.id.lineChart);
-
+        paint = new Paint();
         dataset = new LineSet();
-        dataset.setColor(Color.parseColor("#3F334D"));
-        dataset.addPoint("first", (float) 10.0);
-        dataset.addPoint("second", (float) 17.0);
-        dataset.addPoint("third", (float) 8.0);
-        dataset.addPoint("fourth", (float) 15.0);
-        dataset.addPoint("fifth", (float) 12.0);
+
+        mLinearLayout = (LinearLayout) view.findViewById(R.id.equalizerContainer);
+
+        TextView equalizerHeading = new TextView(HomeActivity.ctx);
+        equalizerHeading.setText("Equalizer");
+        equalizerHeading.setTextSize(20);
+        equalizerHeading.setGravity(Gravity.CENTER_HORIZONTAL);
+
+//        mLinearLayout.addView(equalizerHeading);
+
+        numberOfFrequencyBands = PlayerFragment.mEqualizer.getNumberOfBands();
+
+        points = new float[numberOfFrequencyBands];
+
+        final short lowerEqualizerBandLevel = PlayerFragment.mEqualizer.getBandLevelRange()[0];
+        final short upperEqualizerBandLevel = PlayerFragment.mEqualizer.getBandLevelRange()[1];
+
+        for (short i = 0; i < numberOfFrequencyBands; i++) {
+            final short equalizerBandIndex = i;
+            final TextView frequencyHeaderTextView = new TextView(HomeActivity.ctx);
+            frequencyHeaderTextView.setLayoutParams(new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            ));
+            frequencyHeaderTextView.setGravity(Gravity.CENTER_HORIZONTAL);
+            frequencyHeaderTextView.setTextColor(Color.parseColor("#FFFFFF"));
+            frequencyHeaderTextView.setText((PlayerFragment.mEqualizer.getCenterFreq(equalizerBandIndex) / 1000) + "Hz");
+            mLinearLayout.addView(frequencyHeaderTextView);
+
+            LinearLayout seekBarRowLayout = new LinearLayout(HomeActivity.ctx);
+            seekBarRowLayout.setOrientation(LinearLayout.HORIZONTAL);
+
+            TextView lowerEqualizerBandLevelTextView = new TextView(HomeActivity.ctx);
+            lowerEqualizerBandLevelTextView.setLayoutParams(new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.WRAP_CONTENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            ));
+            lowerEqualizerBandLevelTextView.setTextColor(Color.parseColor("#FFFFFF"));
+            lowerEqualizerBandLevelTextView.setText((lowerEqualizerBandLevel / 100) + "dB");
+
+            TextView upperEqualizerBandLevelTextView = new TextView(HomeActivity.ctx);
+            lowerEqualizerBandLevelTextView.setLayoutParams(new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.WRAP_CONTENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            ));
+            upperEqualizerBandLevelTextView.setTextColor(Color.parseColor("#FFFFFF"));
+            upperEqualizerBandLevelTextView.setText((upperEqualizerBandLevel / 100) + "dB");
+
+            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            );
+            layoutParams.weight = 1;
+
+            SeekBar seekBar = new SeekBar(HomeActivity.ctx);
+            seekBar.getProgressDrawable().setColorFilter(new PorterDuffColorFilter(Color.parseColor("#FFA036"), PorterDuff.Mode.SRC_IN));
+            seekBar.setId(i);
+            seekBar.setLayoutParams(layoutParams);
+            seekBar.setMax(upperEqualizerBandLevel - lowerEqualizerBandLevel);
+
+            points[i] = PlayerFragment.mEqualizer.getBandLevel(equalizerBandIndex) - lowerEqualizerBandLevel;
+
+            dataset.addPoint(frequencyHeaderTextView.getText().toString(), points[i]);
+
+            seekBar.setProgress(PlayerFragment.mEqualizer.getBandLevel(equalizerBandIndex) - lowerEqualizerBandLevel);
+            seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+                @Override
+                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                    PlayerFragment.mEqualizer.setBandLevel(equalizerBandIndex, (short) (progress + lowerEqualizerBandLevel));
+                    points[seekBar.getId()] = PlayerFragment.mEqualizer.getBandLevel(equalizerBandIndex) - lowerEqualizerBandLevel;
+                    dataset.updateValues(points);
+                    chart.notifyDataUpdate();
+                }
+
+                @Override
+                public void onStartTrackingTouch(SeekBar seekBar) {
+
+                }
+
+                @Override
+                public void onStopTrackingTouch(SeekBar seekBar) {
+
+                }
+            });
+
+            seekBarRowLayout.addView(lowerEqualizerBandLevelTextView);
+            seekBarRowLayout.addView(seekBar);
+            seekBarRowLayout.addView(upperEqualizerBandLevelTextView);
+
+            mLinearLayout.addView(seekBarRowLayout);
+        }
+
+        paint.setColor(Color.parseColor("#BBBBBB"));
+
+        dataset.setColor(Color.parseColor("#FFA036"));
 
         dataset.setSmooth(true);
 
         chart.setXAxis(false);
         chart.setYAxis(false);
 
         chart.setYLabels(AxisController.LabelPosition.NONE);
-        chart.setGrid(ChartView.GridType.HORIZONTAL,paint);
+        chart.setGrid(ChartView.GridType.HORIZONTAL, paint);
+
+        chart.setAxisBorderValues(-500, 3500);
 
-        Animation anim = new Animation();
-        anim.setDuration(1500);
-        anim.setEasing(new ExpoEase());
-        anim.setAlpha(1);
+//        Animation anim = new Animation();
+//        anim.setDuration(500);
+//        anim.setEasing(new ExpoEase());
+//        anim.setAlpha(1);
 
         chart.addData(dataset);
-        chart.show(anim);
+        chart.show();
 
     }
 }