added notify before time

FazziCLAY · Dec 30, 2021 · d0fe6a5 · d0fe6a5
1 parent 48c965f
commit d0fe6a5
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 1 deletion.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/ru/fazziclay/schoolguide/SchoolGuide.java b/app/src/main/java/ru/fazziclay/schoolguide/SchoolGuide.java
@@ -141,7 +141,7 @@ public void notificationTick() {
                 notificationData.sub = getString(R.string.mainNotification_lesson_sub_ending);
             }
 
-        } else if (state.isRest()) {
+        } else if (state.isRest() && selectedLocalSchedule.getTimeBeforeStartLesson() <= settingsProvider.getNotifyBeforeTime()) {
             isNotificationVisible = true;
             notificationData.isProgress = false;
 

diff --git a/app/src/main/java/ru/fazziclay/schoolguide/android/activity/settings/SettingsActivity.java b/app/src/main/java/ru/fazziclay/schoolguide/android/activity/settings/SettingsActivity.java
@@ -1,5 +1,6 @@
 package ru.fazziclay.schoolguide.android.activity.settings;
 
+import android.app.TimePickerDialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -23,6 +24,7 @@
 import ru.fazziclay.schoolguide.data.settings.NotificationClickAction;
 import ru.fazziclay.schoolguide.data.settings.SettingsProvider;
 import ru.fazziclay.schoolguide.databinding.ActivitySettingsBinding;
+import ru.fazziclay.schoolguide.util.TimeUtil;
 
 public class SettingsActivity extends AppCompatActivity {
     ActivitySettingsBinding binding;
@@ -85,6 +87,12 @@ private void initLayout() {
                 binding.isSyncDeveloperSchedule.setChecked(false);
             }
         });
+
+        binding.notifyBeforeTime.setOnClickListener(ignore -> timePicker(settingsProvider.getNotifyBeforeTime(), getString(R.string.settings_notifyBeforeTime_title), seconds -> {
+            settingsProvider.setNotifyBeforeTime(seconds);
+            initNotifyBeforeTimeText();
+        }));
+        initNotifyBeforeTimeText();
     }
 
     private void initNotificationClickActionSpinner() {
@@ -131,4 +139,23 @@ public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l)
             });
         }
     }
+
+    private void initNotifyBeforeTimeText() {
+        binding.notifyBeforeTime.setText(getString(R.string.settings_notifyBeforeTime, TimeUtil.secondsToHumanTime(settingsProvider.getNotifyBeforeTime(), true)));
+    }
+
+    interface TimePickedInterface {
+        void run(int seconds);
+    }
+
+    private void timePicker(int defaultTime, String dialogTitle, TimePickedInterface pickedInterface) {
+        TimePickerDialog timePickerDialog = new TimePickerDialog(this,
+                (timePicker, hour, minute) -> {
+                    int seconds = (hour*60*60) + minute*60;
+                    pickedInterface.run(seconds);
+                }, TimeUtil.getHoursInSeconds(defaultTime), TimeUtil.getMinutesInSeconds(defaultTime), true);
+
+        timePickerDialog.setMessage(dialogTitle);
+        timePickerDialog.show();
+    }
 }
diff --git a/app/src/main/java/ru/fazziclay/schoolguide/data/settings/Settings.java b/app/src/main/java/ru/fazziclay/schoolguide/data/settings/Settings.java
@@ -13,4 +13,5 @@ public class Settings extends BaseData {
     List<Integer> versionsHistory = new ArrayList<>();
     boolean isSyncDeveloperSchedule = false;
     NotificationStyle notificationStyle = new NotificationStyle();
+    int notifyBeforeTime = 3*60*60;
 }
diff --git a/app/src/main/java/ru/fazziclay/schoolguide/data/settings/SettingsProvider.java b/app/src/main/java/ru/fazziclay/schoolguide/data/settings/SettingsProvider.java
@@ -79,4 +79,15 @@ public void setSyncDeveloperSchedule(boolean syncDeveloperSchedule) {
     public NotificationStyle getNotificationStyle() {
         return getSettings().notificationStyle;
     }
+
+
+    public int getNotifyBeforeTime() {
+        return getSettings().notifyBeforeTime;
+    }
+
+    public void setNotifyBeforeTime(int notifyBeforeTime) {
+        getSettings().notifyBeforeTime = notifyBeforeTime;
+        save();
+    }
+
 }
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -58,5 +58,17 @@
             android:background="#0C0C0C"
             android:layout_margin="4sp"
             tools:ignore="SpeakableTextPresentCheck" />
+
+        <TextView
+            android:id="@+id/notifyBeforeTime"
+            android:background="?attr/textViewButtonBackgroundColor"
+            android:layout_width="match_parent"
+            android:layout_height="40sp"
+            android:layout_margin="2sp"
+            android:gravity="center"
+            android:textColor="?attr/textViewButtonTextColor"
+            android:textAllCaps="false"
+            android:textSize="20sp"
+            android:text="@string/settings_notifyBeforeTime" />
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -100,4 +100,6 @@
     <string name="settings_selectedLocalSchedule">Selected schedule</string>
     <string name="settings_isVibration">Vibration</string>
     <string name="settings_notificationStyle_clickAction">Notification Click Action</string>
+    <string name="settings_notifyBeforeTime">Начинать уведомлять за %s до</string>
+    <string name="settings_notifyBeforeTime_title">Начинать уведомлять за столько время до...</string>
 </resources>