Skip to content

Possibility to have mute beats in the metronome #20

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.

Sign up for GitHub

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

Open
Calipsiens wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Possibility to have mute beats in the metronome #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 23 additions & 13 deletions src/main/java/mn.tck.semitone/MetronomeFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package mn.tck.semitone;

import android.content.Context;
import android.graphics.Paint;
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.shapes.OvalShape;
import android.os.Bundle;
Expand Down Expand Up @@ -59,7 +60,7 @@ public class MetronomeFragment extends SemitoneFragment {
Button startBtn, tapBtn;

View view;
ShapeDrawable dotOn, dotOnBig, dotOff, dotOffBig;
ShapeDrawable dotOn, dotOnBig, dotOnMute, dotOff, dotOffBig, dotOffMute;
LinearLayout.LayoutParams dotParams;

Tick tick;
Expand Down Expand Up @@ -150,10 +151,12 @@ public MetronomeFragment() {

final int smallSize = getResources().getDimensionPixelSize(R.dimen.small_dot),
largeSize = getResources().getDimensionPixelSize(R.dimen.large_dot);
dotOn = makeDot(smallSize, R.color.white);
dotOnBig = makeDot(largeSize, R.color.white);
dotOff = makeDot(smallSize, R.color.grey1);
dotOffBig = makeDot(largeSize, R.color.grey1);
dotOn = makeDot(smallSize, R.color.white, false);
dotOnBig = makeDot(largeSize, R.color.white, false);
dotOnMute = makeDot(smallSize, R.color.white, true);
dotOff = makeDot(smallSize, R.color.grey1, false);
dotOffBig = makeDot(largeSize, R.color.grey1, false);
dotOffMute = makeDot(smallSize, R.color.grey1, true);

dotParams = new LinearLayout.LayoutParams(0, LayoutParams.WRAP_CONTENT, 1);

Expand All @@ -171,11 +174,14 @@ public MetronomeFragment() {

@Override public void onSettingsChanged() {}

private ShapeDrawable makeDot(int size, int color) {
private ShapeDrawable makeDot(int size, int color, boolean stroke) {
ShapeDrawable dot = new ShapeDrawable(new OvalShape());
dot.setIntrinsicWidth(size);
dot.setIntrinsicHeight(size);
dot.getPaint().setColor(ContextCompat.getColor(getContext(), color));
if (stroke) {
dot.getPaint().setStyle(Paint.Style.STROKE);
}
return dot;
}

Expand Down Expand Up @@ -274,8 +280,9 @@ public Tick(int tempo, int subdiv) {

// time for another tick
if (nTicks % subdiv == 0) activeDot = (activeDot + 1) % beats;
PianoEngine.playFile(nTicks % subdiv == 0 && dots.get(activeDot).big ?
"strong.mp3" : "weak.mp3", 440);
if (! dots.get(activeDot).isMute()) {
PianoEngine.playFile(nTicks % subdiv == 0 && dots.get(activeDot).isStrong() ? "strong.mp3" : "weak.mp3", 440);
}
if (getActivity() != null) getActivity().runOnUiThread(new Runnable() {
@Override public void run() {
dots.get(activeDot).turnOn();
Expand All @@ -301,25 +308,28 @@ protected long tickTime(int nTick) {
}

class Dot extends ImageView {
boolean big;
int state; // 0 is weak, 1 is strong, 2 is mute
public Dot(Context context, boolean big) {
super(context);
this.big = big;
state = big ? 1 : 0;
turnOff();
setLayoutParams(dotParams);
}

@Override public boolean onTouchEvent(MotionEvent ev) {
if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) {
big = !big;
state = (state + 1) % 3;
turnOff();
return true;
}
return false;
}

public void turnOff() { setImageDrawable(big ? dotOffBig : dotOff); }
public void turnOn() { setImageDrawable(big ? dotOnBig : dotOn); }
public boolean isMute() { return (state == 2); };
public boolean isStrong() { return (state == 1); };

public void turnOff() { setImageDrawable(state == 0 ? dotOff : (state == 1 ? dotOffBig : dotOffMute)); }
public void turnOn() { setImageDrawable(state == 0 ? dotOn : (state == 1 ? dotOnBig : dotOnMute )); }
}

}