1
0
Fork 0

Implemented leekspin change mode

This commit is contained in:
Jonathan Chan 2016-08-03 21:06:47 -07:00
parent e9e8f9e7ba
commit c9c52f4997
2 changed files with 40 additions and 9 deletions

View File

@ -8,6 +8,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color; import android.graphics.Color;
import android.media.MediaPlayer;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
@ -55,6 +56,7 @@ public class MainActivity extends AppCompatActivity {
private View mainView; private View mainView;
private Timer timer; private Timer timer;
private TimerTask timerTask; private TimerTask timerTask;
private MediaPlayer mediaPlayer;
private Random random; private Random random;
private final Runnable mHidePart2Runnable = new Runnable() { private final Runnable mHidePart2Runnable = new Runnable() {
@SuppressLint("InlinedApi") @SuppressLint("InlinedApi")
@ -218,6 +220,19 @@ public class MainActivity extends AppCompatActivity {
setTimer(); setTimer();
} }
/**
* Release the media player when not in use
*/
@Override
public void onPause() {
super.onPause();
if (mediaPlayer != null) {
mediaPlayer.stop();
mediaPlayer.release();
mediaPlayer = null;
}
}
/** /**
* Sets background colour to a randomly-generated pastel colour * Sets background colour to a randomly-generated pastel colour
*/ */
@ -229,15 +244,16 @@ public class MainActivity extends AppCompatActivity {
// Set the text colour to something more readable given the colour type // Set the text colour to something more readable given the colour type
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
String currentColourType = preferences.getString("colour_type", "0.3"); String currentColourType = preferences.getString("colour_type", "0.3");
String[] colourTypes = getResources().getStringArray(R.array.preferences_colour_values); switch (currentColourType) {
if (currentColourType.equals(colourTypes[0])) { case "0.3":
((TextView)mContentView).setTextColor(ContextCompat.getColor(this, R.color.colorPastelBackground)); ((TextView)mContentView).setTextColor(ContextCompat.getColor(this, R.color.colorPastelBackground));
} break;
else if (currentColourType.equals(colourTypes[1])) { case "0.5":
((TextView)mContentView).setTextColor(ContextCompat.getColor(this, R.color.colorPastelNeonBackground)); ((TextView)mContentView).setTextColor(ContextCompat.getColor(this, R.color.colorPastelNeonBackground));
} break;
else if (currentColourType.equals(colourTypes[2])) { case "0.7":
((TextView)mContentView).setTextColor(ContextCompat.getColor(this, R.color.colorNeonBackground)); ((TextView)mContentView).setTextColor(ContextCompat.getColor(this, R.color.colorNeonBackground));
break;
} }
} }
@ -282,6 +298,21 @@ public class MainActivity extends AppCompatActivity {
timer.schedule(timerTask, 0, 1000); timer.schedule(timerTask, 0, 1000);
break; break;
case "leekspin": case "leekspin":
timerTask = new TimerTask() {
@Override
public void run() {
runOnUiThread(new Runnable() {
@Override
public void run() {
setBackgroundToRandomColour();
}
});
}
};
timer.schedule(timerTask, 0, 556);
mediaPlayer = MediaPlayer.create(this, R.raw.ievan_polkka);
mediaPlayer.setLooping(true);
mediaPlayer.start();
break; break;
} }
} }

Binary file not shown.