Skip to content

Commit 1b687cf

Browse files
committed
Revert "longer toast"
This reverts commit d2d5dd3.
1 parent d2d5dd3 commit 1b687cf

File tree

2 files changed

+4
-43
lines changed

2 files changed

+4
-43
lines changed

app/src/main/java/com/learntodroid/simplealarmclock/activities/RingActivity.java

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,17 @@
99
import androidx.appcompat.app.AppCompatActivity;
1010

1111
import com.learntodroid.simplealarmclock.R;
12-
import com.learntodroid.simplealarmclock.createalarm.TimePickerUtil;
13-
import com.learntodroid.simplealarmclock.data.Alarm;
1412
import com.learntodroid.simplealarmclock.service.AlarmService;
1513

16-
import java.util.Calendar;
17-
import java.util.Random;
18-
19-
import butterknife.BindView;
20-
import butterknife.ButterKnife;
21-
2214
public class RingActivity extends AppCompatActivity {
23-
@BindView(R.id.activity_ring_dismiss) Button dismiss;
24-
@BindView(R.id.activity_ring_snooze) Button snooze;
15+
private Button dismiss, snooze;
2516

2617
@Override
2718
protected void onCreate(@Nullable Bundle savedInstanceState) {
2819
super.onCreate(savedInstanceState);
2920
setContentView(R.layout.activity_ring);
3021

31-
ButterKnife.bind(this);
32-
22+
dismiss = findViewById(R.id.activity_ring_dismiss);
3323
dismiss.setOnClickListener(new View.OnClickListener() {
3424
@Override
3525
public void onClick(View v) {
@@ -39,35 +29,6 @@ public void onClick(View v) {
3929
}
4030
});
4131

42-
snooze.setOnClickListener(new View.OnClickListener() {
43-
@Override
44-
public void onClick(View v) {
45-
Calendar calendar = Calendar.getInstance();
46-
calendar.setTimeInMillis(System.currentTimeMillis());
47-
calendar.add(Calendar.MINUTE, 10);
48-
49-
Alarm alarm = new Alarm(
50-
new Random().nextInt(Integer.MAX_VALUE),
51-
calendar.get(Calendar.HOUR_OF_DAY),
52-
calendar.get(Calendar.MINUTE),
53-
"Snooze",
54-
true,
55-
false,
56-
false,
57-
false,
58-
false,
59-
false,
60-
false,
61-
false,
62-
false
63-
);
64-
65-
alarm.schedule(getApplicationContext());
66-
67-
Intent intentService = new Intent(getApplicationContext(), AlarmService.class);
68-
getApplicationContext().stopService(intentService);
69-
finish();
70-
}
71-
});
32+
//todo implement snooze button
7233
}
7334
}

app/src/main/java/com/learntodroid/simplealarmclock/data/Alarm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void schedule(Context context) {
138138
}
139139

140140
String toastText = String.format("Alarm %s scheduled for %s at %02d:%02d", title, DayUtil.toDay(calendar.get(Calendar.DAY_OF_WEEK)), hour, minute, alarmId);
141-
Toast.makeText(context, toastText, Toast.LENGTH_LONG).show();
141+
Toast.makeText(context, toastText, Toast.LENGTH_SHORT).show();
142142

143143
if (!recurring) {
144144
alarmManager.setExact(

0 commit comments

Comments
 (0)