Skip to content

Commit 8245c00

Browse files
Smart Alarm
1 parent a533ee1 commit 8245c00

File tree

3 files changed

+33
-11
lines changed

3 files changed

+33
-11
lines changed

app/src/main/java/it/ezzie/smartalarm/AlarmAdapter.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,26 @@ public void onBindViewHolder(@NonNull AlarmViewHolder holder, int position) {
5353
var alarm = alarmList.get(position);
5454
//InitTimePick
5555
holder.binding.alarmTime.setOnClickListener(v -> {
56-
TimePickerDialog.OnTimeSetListener timepick = new TimePickerDialog.OnTimeSetListener() {
56+
TimePickerDialog.OnTimeSetListener timePick = new TimePickerDialog.OnTimeSetListener() {
5757
@Override
5858
public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
5959
calendar.set(Calendar.HOUR_OF_DAY,hourOfDay);
6060
calendar.set(Calendar.MINUTE,minute);
61-
// var formattedTime = new SimpleDateFormat("HH:mm").format(calendar.getTime());
62-
// var formattedHour = new SimpleDateFormat("HH").format(calendar.getTime());
63-
// var formattedMinute = new SimpleDateFormat("mm").format(calendar.getTime());
61+
var formattedTime = new SimpleDateFormat("HH:mm").format(calendar.getTime());
62+
var formattedHour = new SimpleDateFormat("HH").format(calendar.getTime());
63+
var formattedMinute = new SimpleDateFormat("mm").format(calendar.getTime());
6464
var formattedUnit = new SimpleDateFormat("a").format(calendar.getTime());
6565
holder.binding.alarmUnit.setText(formattedUnit.toUpperCase());
66+
holder.binding.alarmHour.setText(formattedHour);
67+
holder.binding.alarmMinute.setText(formattedMinute);
68+
if(formattedUnit.equals("PM")){
69+
holder.binding.imageView.setImageResource(R.drawable.ic_moon);
70+
}else if(formattedUnit.equals("am")){
71+
holder.binding.imageView.setImageResource(R.drawable.ic_sun);
72+
}
6673
}
6774
};
68-
new TimePickerDialog(context,timepick, calendar.get(Calendar.HOUR_OF_DAY),calendar.get(Calendar.MINUTE),false).show();
75+
new TimePickerDialog(context,timePick, calendar.get(Calendar.HOUR_OF_DAY),calendar.get(Calendar.MINUTE),false).show();
6976

7077
});
7178
holder.binding.alarmLabel.setText(alarm.getAlarmLabel());

app/src/main/java/it/ezzie/smartalarm/EditAlarm.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import androidx.core.view.WindowInsetsCompat;
1111
import androidx.room.Room;
1212

13+
import java.text.SimpleDateFormat;
1314
import java.util.Calendar;
1415

1516
import it.ezzie.smartalarm.Data_Access_Object.AlarmDAO;
@@ -55,8 +56,8 @@ private void initData(){
5556
binding.hour.setText(String.valueOf(resultHour));
5657
binding.minute.setText(String.format("%02d",resultMinute));
5758

58-
//Getting Alarm Label
59-
String label = String.valueOf(binding.alarmEditTxt.getText());
59+
//Init AlarmUnit
60+
var formattedUnit = new SimpleDateFormat("a").format(calendar.getTime());
6061

6162
//Cancel Button
6263
binding.btnCancel.setOnClickListener(v -> {
@@ -66,11 +67,13 @@ private void initData(){
6667
//OK Button
6768
binding.btnOK.setOnClickListener(v -> {
6869
AlarmEntity alarm;
70+
//Getting Alarm Label
71+
String label = binding.alarmEditTxt.getText().toString().trim();
6972
if(label.isEmpty()){
70-
alarm = new AlarmEntity(String.valueOf(hourOfDay),String.format("%02d",minute));
73+
alarm = new AlarmEntity(String.valueOf(hourOfDay),String.format("%02d",minute),formattedUnit);
7174
}
7275
else {
73-
alarm = new AlarmEntity(String.valueOf(hourOfDay), String.format("%02d", minute), label);
76+
alarm = new AlarmEntity(String.valueOf(hourOfDay), String.format("%02d", minute),formattedUnit, label);
7477
}
7578
Intent intent = new Intent(this, MainActivity.class);
7679
intent.putExtra("alarm",alarm);

app/src/main/java/it/ezzie/smartalarm/Entity/AlarmEntity.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,25 @@ public class AlarmEntity implements Serializable {
1515
private String alarmHour;
1616
@ColumnInfo(name = "Minute")
1717
private String alarmMinute;
18+
@ColumnInfo(name = "Unit")
19+
private String alarmUnit;
1820
@ColumnInfo(name = "Label")
1921
private String alarmLabel;
2022

2123
public AlarmEntity(){
2224

2325
}
2426
@Ignore
25-
public AlarmEntity( String alarmHour, String alarmMinute){
27+
public AlarmEntity( String alarmHour, String alarmMinute, String alarmUnit){
2628
this.alarmHour = alarmHour;
2729
this.alarmMinute = alarmMinute;
30+
this.alarmUnit = alarmUnit;
2831
}
2932
@Ignore
30-
public AlarmEntity( String alarmHour, String alarmMinute, String alarmLabel){
33+
public AlarmEntity( String alarmHour, String alarmMinute,String alarmUnit, String alarmLabel){
3134
this.alarmHour = alarmHour;
3235
this.alarmMinute = alarmMinute;
36+
this.alarmUnit = alarmUnit;
3337
this.alarmLabel = alarmLabel;
3438
}
3539

@@ -57,6 +61,14 @@ public void setAlarmMinute(String alarmMinute) {
5761
this.alarmMinute = alarmMinute;
5862
}
5963

64+
public String getAlarmUnit() {
65+
return alarmUnit;
66+
}
67+
68+
public void setAlarmUnit(String alarmUnit) {
69+
this.alarmUnit = alarmUnit;
70+
}
71+
6072
public String getAlarmLabel() {
6173
return alarmLabel;
6274
}

0 commit comments

Comments
 (0)