From d0fe6a5ea99538c9c7ce50b3ece1a77a78737f21 Mon Sep 17 00:00:00 2001
From: fazziclay <fazziclay@gmail.com>
Date: Thu, 30 Dec 2021 11:22:48 +0300
Subject: [PATCH] added notify before time

---
 .idea/inspectionProfiles/Project_Default.xml  |  1 +
 .idea/misc.xml                                |  1 +
 .../ru/fazziclay/schoolguide/SchoolGuide.java |  2 +-
 .../activity/settings/SettingsActivity.java   | 27 +++++++++++++++++++
 .../schoolguide/data/settings/Settings.java   |  1 +
 .../data/settings/SettingsProvider.java       | 11 ++++++++
 app/src/main/res/layout/activity_settings.xml | 12 +++++++++
 app/src/main/res/values/strings.xml           |  2 ++
 8 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 3718285..88dc845 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComparatorCombinators" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ConstantConditions" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
       <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 83e1c49..9308f64 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,6 +43,7 @@
         <entry key="..\:/Users/fazziclay/_I_PRO/SchoolGuide/app/src/main/res/layout/activity_update_checker.xml" value="0.17806484295845998" />
         <entry key="..\:/Users/fazziclay/_I_PRO/SchoolGuide/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.25" />
         <entry key="..\:/Users/fazziclay/_I_PRO/SchoolGuide/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.3828125" />
+        <entry key="..\:/_MOE/_I_PRO/SchoolGuide/app/src/main/res/layout/activity_schedule_lesson_edit.xml" value="0.2545289855072464" />
         <entry key="..\:/_MOE/_I_PRO/SchoolGuide/app/src/main/res/layout/activity_settings.xml" value="0.5988428158148505" />
         <entry key="app/src/main/res/layout/activity_home.xml" value="0.3640625" />
         <entry key="app/src/main/res/layout/main_widget.xml" value="0.3640625" />
diff --git a/app/src/main/java/ru/fazziclay/schoolguide/SchoolGuide.java b/app/src/main/java/ru/fazziclay/schoolguide/SchoolGuide.java
index 95dea31..8780359 100644
--- 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
index 1376407..e3dc358 100644
--- 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();
+    }
 }
\ No newline at end of file
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
index 83baaed..dfe9203 100644
--- 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
index 3637ac3..844c245 100644
--- 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
index 83f344d..9375397 100644
--- 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>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34f8736..f0cf992 100644
--- 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>