github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-09-19 21:49:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dodaj opcję wyłączenia powiadomień o nie swoim szczęśliwym numerku

Browse Source 
Dodaje opcję w ustawieniach która powoduje że gdy szczęśliwy numerek wypadnie na kogoś innego to nie jest wysyłane powiadomienie.
Codzienny spam że numer X ma dziś szczęśliwy numer może być irytujący więc wiele osób może uznać to za użyteczne
This commit is contained in:
Koliw 2023-12-24 15:43:35 +01:00
parent cefb0deba8
commit 41d14a3809
No known key found for this signature in database
GPG Key ID: FCAC54B846429FAB
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt
View File

@ -27,6 +27,8 @@ class ConfigSync(base: Config) {
var quietHoursEnd by base.config<Time?>(null)
var quietDuringLessons by base.config<Boolean>(false)
var luckyNumberOnlyMe by base.config<Boolean>(false)
// FCM Tokens
var tokenApp by base.config<String?>(null)
var tokenMobidziennik by base.config<String?>(null)

1
app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/Notifications.kt
View File

@ -321,6 +321,7 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
luckyNumbers.removeAll { it.date < today }
luckyNumbers.forEach { luckyNumber ->
val profile = profiles.singleOrNull { it.id == luckyNumber.profileId } ?: return@forEach
if(app.config.sync.luckyNumberOnlyMe && profile.studentNumber != luckyNumber.number) return@forEach
val text = when (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) {
true -> when (luckyNumber.date.value) {
todayValue -> R.string.notification_lucky_number_yours_format

12
app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsSyncCard.kt
View File

@ -12,7 +12,6 @@ import android.os.Build.VERSION_CODES
import android.provider.Settings
import com.danielstone.materialaboutlibrary.model.MaterialAboutCard
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import pl.szczodrzynski.edziennik.MainActivity
import pl.szczodrzynski.edziennik.R
import pl.szczodrzynski.edziennik.ext.after
import pl.szczodrzynski.edziennik.ext.getSyncInterval
@ -128,7 +127,15 @@ class SettingsSyncCard(util: SettingsUtil) : SettingsCard(util) {
) {
NotificationFilterDialog(activity).show()
},
util.createPropertyItem(
text = R.string.settings_lucky_number_only_me_text,
subText = R.string.settings_lucky_number_only_me_descryption,
icon = CommunityMaterial.Icon.cmd_bell_cancel,
value = configGlobal.sync.luckyNumberOnlyMe
) { _, it ->
configGlobal.sync.luckyNumberOnlyMe = it
UpdateWorker.rescheduleNext(app)
},
util.createPropertyActionItem(
text = R.string.settings_sync_quiet_hours_text,
subText = R.string.settings_sync_quiet_hours_subtext_disabled,
@ -166,7 +173,6 @@ class SettingsSyncCard(util: SettingsUtil) : SettingsCard(util) {
configGlobal.sync.notifyAboutUpdates = it
UpdateWorker.rescheduleNext(app)
},
if (SDK_INT >= VERSION_CODES.KITKAT)
util.createActionItem(
text = R.string.settings_sync_notifications_settings_text,

3
app/src/main/res/values/strings.xml
View File

@ -1553,4 +1553,7 @@
<string name="home_timetable_all_lessons">Wszystkie lekcje:</string>
<string name="agenda_config_subject_important">Wyświetl nazwę przedmiotu zamiast rodzaju</string>
<string name="menu_timetable_sync">Odśwież wybrany tydzień</string>
<string name="settings_lucky_number_only_me_text">Szczęśliwy Numerek tylko dla Ciebie</string>
<string name="settings_lucky_number_only_me_descryption">Wysyła powiadomienia o Szczęśliwym Numerku jedynie gdy Ty zostaniesz wybrany</string>
</resources>