rixty
/
Amadeus
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WIP: small adjustments to alarm

This commit is contained in:
RIP95 2017-03-19 03:16:41 +03:00
parent 9d1d3a6462
commit 74263c58d5
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/example/yink/amadeus/AlarmActivity.java
View File

@ -15,6 +15,7 @@ import android.util.Log;
import android.view.View;
import android.widget.TextView;
import android.widget.TimePicker;
import android.widget.Toast;
import android.widget.ToggleButton;
import java.util.Calendar;
@ -58,18 +59,18 @@ public class AlarmActivity extends Activity {
editor = settings.edit();
if (alarmToggle.isChecked()) {
editor.putBoolean("alarm_toggle", true);
Log.d(TAG, "Alarm On");
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.HOUR_OF_DAY, alarmTimePicker.getCurrentHour());
calendar.set(Calendar.MINUTE, alarmTimePicker.getCurrentMinute());
alarmManager.set(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), pendingIntent);
Toast.makeText(this, "Alarm has been set for " + alarmTimePicker.getCurrentHour() + " hour(s) " + alarmTimePicker.getCurrentMinute() + " minute(s)", Toast.LENGTH_SHORT).show();
Log.d(TAG, "Alarm On");
} else {
if (pendingIntent != null) {
editor.putBoolean("alarm_toggle", false);
AlarmReceiver.stopRingtone();
alarmManager.cancel(pendingIntent);
Log.d(TAG, "Alarm Off");
}
AlarmReceiver.stopRingtone();
editor.putBoolean("alarm_toggle", false);
alarmManager.cancel(pendingIntent);
Toast.makeText(this, "Alarm has been removed", Toast.LENGTH_SHORT).show();
Log.d(TAG, "Alarm Off");
}
editor.apply();
}

23
app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
View File

@ -32,7 +32,6 @@ public class LaunchActivity extends AppCompatActivity {
Handler aniHandle = new Handler();
AlarmManager alarmManager;
PendingIntent pendingIntent;
public static final int alarmCode = 104856;
NotificationManager notificationManager;
int i = 0;
@ -70,7 +69,7 @@ public class LaunchActivity extends AppCompatActivity {
aniHandle.post(aniRunnable);
alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
Intent alarmIntent = new Intent(this, AlarmReceiver.class);
pendingIntent = PendingIntent.getBroadcast(this, alarmCode, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
pendingIntent = PendingIntent.getBroadcast(this, AlarmActivity.alarmCode, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
notificationManager = (NotificationManager) getBaseContext().getSystemService(Context.NOTIFICATION_SERVICE);
settings = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
if (!isAppInstalled(LaunchActivity.this, "com.google.android.googlequicksearchbox")) {
@ -92,11 +91,12 @@ public class LaunchActivity extends AppCompatActivity {
public void onClick(View view) {
if (!isPressed && isAppInstalled(LaunchActivity.this, "com.google.android.googlequicksearchbox")) {
isPressed = true;
m = MediaPlayer.create(getApplicationContext(), R.raw.tone);
connect.setImageResource(R.drawable.connect_select);
if (!AlarmReceiver.isPlaying()) {
m = MediaPlayer.create(getApplicationContext(), R.raw.tone);
m.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mp) {
@ -114,11 +114,10 @@ public class LaunchActivity extends AppCompatActivity {
}
});
} else {
if (pendingIntent != null) {
AlarmReceiver.stopRingtone();
notificationManager.cancel(1);
alarmManager.cancel(pendingIntent);
}
AlarmReceiver.stopRingtone();
notificationManager.cancel(1);
alarmManager.cancel(pendingIntent);
Intent intent = new Intent(LaunchActivity.this, MainActivity.class);
startActivity(intent);
}
@ -130,11 +129,9 @@ public class LaunchActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
cancel.setImageResource(R.drawable.cancel_select);
if (pendingIntent != null) {
AlarmReceiver.stopRingtone();
notificationManager.cancel(1);
alarmManager.cancel(pendingIntent);
}
AlarmReceiver.stopRingtone();
notificationManager.cancel(1);
alarmManager.cancel(pendingIntent);
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(Intent.CATEGORY_HOME);