Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 96921a1

Browse files
Finishing Alarm
1 parent d07984a commit 96921a1

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed

‎.idea/deploymentTargetSelector.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools">
4-
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
4+
5+
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
6+
<uses-permission android:name="android.permission.USE_EXACT_ALARM" />
7+
<uses-permission android:name="android.permission.VIBRATE"/>
8+
<uses-permission android:name="android.permission.WAKE_LOCK"/>
59
<application
610
android:allowBackup="true"
711
android:dataExtractionRules="@xml/data_extraction_rules"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public class AlarmAdapter extends RecyclerView.Adapter<AlarmAdapter.AlarmViewHol
2020
private Calendar calendar = Calendar.getInstance();
2121
private AlarmClickListener listener;
2222
private AlarmDAO alarmDAO = AppDatabase.appDatabase.alarmDAO();
23-
private final EditAlarm editAlarm = new EditAlarm();
2423
public AlarmAdapter(Context context , List<AlarmEntity> alarmList, AlarmClickListener listener){
2524
this.context = context;
2625
this.alarmList = alarmList;
@@ -78,7 +77,7 @@ else if(alarm.getAlarmUnit().equalsIgnoreCase("AM")){
7877
alarms.setAlarmOn(false);
7978
}
8079
alarmDAO.updateAlarm(alarms);
81-
editAlarm.scheduleAlarm(alarms);
80+
8281
});
8382
holder.binding.listLinear.setOnClickListener(v -> {
8483
listener.onAlarmClicked(alarms);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void scheduleAlarm(AlarmEntity alarm){
115115
AlarmManager alarmManager = this.getSystemService(AlarmManager.class);
116116
Intent intent = new Intent(this, AlarmReceiver.class);
117117
intent.putExtra("alarmLabel", alarm.getAlarmLabel());
118-
PendingIntent pendingIntent = PendingIntent.getBroadcast(this,Integer.parseInt(alarm.getAlarmHour()) * 100 + Integer.parseInt(alarm.getAlarmMinute()), intent , PendingIntent.FLAG_UPDATE_CURRENT);
118+
PendingIntent pendingIntent = PendingIntent.getBroadcast(this,Integer.parseInt(alarm.getAlarmHour()) * 100 + Integer.parseInt(alarm.getAlarmMinute()), intent , PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
119119
//Init Calendar
120120
Calendar calendar1 = Calendar.getInstance();
121121
calendar1.set(Calendar.HOUR_OF_DAY, Integer.parseInt(alarm.getAlarmHour()));

‎app/src/main/res/layout/adapter_alarm.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
4-
android:layout_height="115dp"
4+
android:layout_height="100dp"
55
android:id="@+id/listLinear"
66
xmlns:app="http://schemas.android.com/apk/res-auto"
7-
android:layout_margin="10dp"
7+
android:layout_margin="5dp"
88
android:background="@drawable/bg_list">
99

1010
<LinearLayout
@@ -14,7 +14,7 @@
1414
app:layout_constraintTop_toTopOf="parent"
1515
app:layout_constraintStart_toStartOf="parent"
1616
android:layout_marginStart="40dp"
17-
android:layout_marginTop="30dp">
17+
android:layout_marginTop="15dp">
1818

1919
<TextView
2020
android:id="@+id/alarmHour"
@@ -23,7 +23,7 @@
2323
app:layout_constraintTop_toTopOf="parent"
2424
app:layout_constraintStart_toStartOf="parent"
2525
android:text="01"
26-
android:textSize="40dp"
26+
android:textSize="35sp"
2727
android:fontFamily="@font/mulish_regular"
2828
android:gravity="center_vertical"/>
2929

@@ -46,7 +46,7 @@
4646
app:layout_constraintBottom_toBottomOf="@id/alarmHour"
4747
app:layout_constraintStart_toEndOf="@id/alarmColumn"
4848
android:text="00"
49-
android:textSize="40dp"
49+
android:textSize="35sp"
5050
android:fontFamily="@font/mulish_regular"
5151
android:gravity="center_vertical" />
5252

@@ -57,7 +57,7 @@
5757
android:layout_width="wrap_content"
5858
android:layout_height="wrap_content"
5959
android:text="Add Label"
60-
android:textSize="16dp"
60+
android:textSize="16sp"
6161
android:fontFamily="@font/mulish_regular"
6262
android:textStyle="bold"
6363
app:layout_constraintBottom_toBottomOf="parent"
@@ -70,7 +70,7 @@
7070
android:layout_width="wrap_content"
7171
android:layout_height="wrap_content"
7272
android:text="AM"
73-
android:textSize="25dp"
73+
android:textSize="20sp"
7474
android:fontFamily="@font/mulish_regular"
7575
android:textStyle="bold"
7676
app:layout_constraintStart_toEndOf="@id/alarmTime"
@@ -79,14 +79,14 @@
7979

8080
<ImageView
8181
android:id="@+id/imageView"
82-
android:layout_width="35dp"
83-
android:layout_height="35dp"
82+
android:layout_width="30dp"
83+
android:layout_height="30dp"
8484
android:layout_marginStart="10dp"
8585
android:src="@drawable/ic_sun"
8686
app:layout_constraintBottom_toTopOf="@id/alarmUnit"
8787
app:layout_constraintStart_toEndOf="@id/alarmTime" />
8888

89-
<com.google.android.material.materialswitch.MaterialSwitch
89+
<com.google.android.material.switchmaterial.SwitchMaterial
9090
android:id="@+id/alarmSwitch"
9191
android:layout_width="wrap_content"
9292
android:layout_height="wrap_content"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /