? = null
private lateinit var lastError: Throwable
private var retryCallback: () -> Unit = {}
- fun onAttachView(view: MessagePreviewView, message: Message) {
+ fun onAttachView(view: MessagePreviewView, message: Message?) {
super.onAttachView(view)
view.initView()
errorHandler.showErrorMessage = ::showErrorViewOnError
- loadData(message)
+ this.message = message
+ loadData(requireNotNull(message))
}
private fun onMessageLoadRetry(message: Message) {
@@ -70,24 +66,25 @@ class MessagePreviewPresenter @Inject constructor(
.logResourceStatus("message ${messageToLoad.messageId} preview")
.onResourceData {
if (it != null) {
- messageWithAttachments = it
+ message = it.message
+ attachments = it.attachments
view?.apply {
setMessageWithAttachment(it)
showContent(true)
initOptions()
- updateMuteToggleButton(isMuted = it.mutedMessageSender != null)
+
if (preferencesRepository.isIncognitoMode && it.message.unread) {
showMessage(R.string.message_incognito_description)
}
}
} else {
- delay(1.seconds)
view?.run {
showMessage(messageNotExists)
popView()
}
}
- }.onResourceSuccess {
+ }
+ .onResourceSuccess {
if (it != null) {
analytics.logEvent(
"load_item",
@@ -95,28 +92,31 @@ class MessagePreviewPresenter @Inject constructor(
"length" to it.message.content.length
)
}
- }.onResourceNotLoading { view?.showProgress(false) }.onResourceError {
+ }
+ .onResourceNotLoading { view?.showProgress(false) }
+ .onResourceError {
retryCallback = { onMessageLoadRetry(messageToLoad) }
errorHandler.dispatch(it)
- }.launch()
+ }
+ .launch()
}
fun onReply(): Boolean {
- return if (messageWithAttachments?.message != null) {
- view?.openMessageReply(messageWithAttachments?.message)
+ return if (message != null) {
+ view?.openMessageReply(message)
true
} else false
}
fun onForward(): Boolean {
- return if (messageWithAttachments?.message != null) {
- view?.openMessageForward(messageWithAttachments?.message)
+ return if (message != null) {
+ view?.openMessageForward(message)
true
} else false
}
fun onShare(): Boolean {
- val message = messageWithAttachments?.message ?: return false
+ val message = message ?: return false
val subject = message.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }
val text = buildString {
@@ -129,15 +129,13 @@ class MessagePreviewPresenter @Inject constructor(
appendLine(message.content.parseAsHtml())
- if (!messageWithAttachments?.attachments.isNullOrEmpty()) {
+ if (!attachments.isNullOrEmpty()) {
appendLine()
appendLine("Załączniki:")
- append(
- messageWithAttachments?.attachments.orEmpty()
- .joinToString(separator = "\n") { attachment ->
- "${attachment.filename}: ${attachment.url}"
- })
+ append(attachments.orEmpty().joinToString(separator = "\n") { attachment ->
+ "${attachment.filename}: ${attachment.url}"
+ })
}
}
@@ -150,7 +148,7 @@ class MessagePreviewPresenter @Inject constructor(
@SuppressLint("NewApi")
fun onPrint(): Boolean {
- val message = messageWithAttachments?.message ?: return false
+ val message = message ?: return false
val subject = message.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }
val dateString = message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")
@@ -161,7 +159,8 @@ class MessagePreviewPresenter @Inject constructor(
append("Od
${message.sender}")
append("DO
${message.recipients}")
}
- val messageContent = "${message.content}
".replace(Regex("[\\n\\r]{2,}"), "")
+ val messageContent = "
${message.content}
"
+ .replace(Regex("[\\n\\r]{2,}"), "")
.replace(Regex("[\\n\\r]"), "
")
val jobName = buildString {
@@ -172,7 +171,9 @@ class MessagePreviewPresenter @Inject constructor(
}
view?.apply {
- val html = printHTML.replace("%SUBJECT%", subject).replace("%CONTENT%", messageContent)
+ val html = printHTML
+ .replace("%SUBJECT%", subject)
+ .replace("%CONTENT%", messageContent)
.replace("%INFO%", infoContent)
printDocument(html, jobName)
}
@@ -180,69 +181,34 @@ class MessagePreviewPresenter @Inject constructor(
return true
}
- private fun restoreMessage() {
- val message = messageWithAttachments?.message ?: return
+ private fun deleteMessage() {
+ message ?: return
view?.run {
showContent(false)
showProgress(true)
- showOptions(
- show = false,
- isReplayable = false,
- isRestorable = false,
- )
+ showOptions(show = false, isReplayable = false)
showErrorView(false)
}
- Timber.i("Restore message ${message.messageGlobalKey}")
+
+ Timber.i("Delete message ${message?.messageGlobalKey}")
+
presenterScope.launch {
runCatching {
val student = studentRepository.getCurrentStudent(decryptPass = true)
val mailbox = messageRepository.getMailboxByStudent(student)
- messageRepository.restoreMessages(student, mailbox, listOfNotNull(message))
+ messageRepository.deleteMessage(student, mailbox, message!!)
}
.onFailure {
- retryCallback = { onMessageRestore() }
+ retryCallback = { onMessageDelete() }
errorHandler.dispatch(it)
}
.onSuccess {
view?.run {
- showMessage(restoreMessageSuccessString)
+ showMessage(deleteMessageSuccessString)
popView()
}
}
- view?.showProgress(false)
- }
- }
-
- private fun deleteMessage() {
- messageWithAttachments?.message ?: return
-
- view?.run {
- showContent(false)
- showProgress(true)
- showOptions(
- show = false,
- isReplayable = false,
- isRestorable = false,
- )
- showErrorView(false)
- }
-
- Timber.i("Delete message ${messageWithAttachments?.message?.messageGlobalKey}")
-
- presenterScope.launch {
- runCatching {
- val student = studentRepository.getCurrentStudent(decryptPass = true)
- messageRepository.deleteMessage(student, messageWithAttachments?.message!!)
- }.onFailure {
- retryCallback = { onMessageDelete() }
- errorHandler.dispatch(it)
- }.onSuccess {
- view?.run {
- showMessage(deleteMessageSuccessString)
- popView()
- }
- }
view?.showProgress(false)
}
@@ -258,11 +224,6 @@ class MessagePreviewPresenter @Inject constructor(
}
}
- fun onMessageRestore(): Boolean {
- restoreMessage()
- return true
- }
-
fun onMessageDelete(): Boolean {
deleteMessage()
return true
@@ -271,39 +232,20 @@ class MessagePreviewPresenter @Inject constructor(
private fun initOptions() {
view?.apply {
showOptions(
- show = messageWithAttachments?.message != null,
- isReplayable = messageWithAttachments?.message?.folderId == MessageFolder.RECEIVED.id,
- isRestorable = messageWithAttachments?.message?.folderId == MessageFolder.TRASHED.id,
+ show = message != null,
+ isReplayable = message?.folderId != MessageFolder.SENT.id,
)
+ message?.let {
+ when (it.folderId == MessageFolder.TRASHED.id) {
+ true -> setDeletedOptionsLabels()
+ false -> setNotDeletedOptionsLabels()
+ }
+ }
+
}
}
fun onCreateOptionsMenu() {
initOptions()
}
-
- fun onMute(): Boolean {
- val message = messageWithAttachments?.message ?: return false
- val isMuted = messageWithAttachments?.mutedMessageSender != null
-
- presenterScope.launch {
- runCatching {
- when (isMuted) {
- true -> {
- messageRepository.unmuteMessage(message.correspondents)
- view?.run { showMessage(unmuteMessageSuccessString) }
- }
-
- false -> {
- messageRepository.muteMessage(message.correspondents)
- view?.run { showMessage(muteMessageSuccessString) }
- }
- }
- }.onFailure {
- errorHandler.dispatch(it)
- }
- }
- view?.updateMuteToggleButton(isMuted)
- return true
- }
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
index ee0b6ce0a..7f5f140b2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
@@ -9,12 +9,6 @@ interface MessagePreviewView : BaseView {
val deleteMessageSuccessString: String
- val muteMessageSuccessString: String
-
- val unmuteMessageSuccessString: String
-
- val restoreMessageSuccessString: String
-
val messageNoSubjectString: String
val printHTML: String
@@ -25,8 +19,6 @@ interface MessagePreviewView : BaseView {
fun setMessageWithAttachment(item: MessageWithAttachment)
- fun updateMuteToggleButton(isMuted: Boolean)
-
fun showProgress(show: Boolean)
fun showContent(show: Boolean)
@@ -37,7 +29,11 @@ interface MessagePreviewView : BaseView {
fun setErrorRetryCallback(callback: () -> Unit)
- fun showOptions(show: Boolean, isReplayable: Boolean, isRestorable: Boolean)
+ fun showOptions(show: Boolean, isReplayable: Boolean)
+
+ fun setDeletedOptionsLabels()
+
+ fun setNotDeletedOptionsLabels()
fun openMessageReply(message: Message?)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
index 6155baea3..e776e9941 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -203,7 +203,7 @@ class SendMessagePresenter @Inject constructor(
subject = subject,
content = content,
recipients = recipients,
- mailbox = mailbox,
+ mailboxId = mailbox.globalKey,
)
}.logResourceStatus("sending message").onEach {
when (it) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
index fadc77e6d..9792c7085 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
@@ -18,7 +18,8 @@ import io.github.wulkanowy.utils.getThemeAttrColor
import io.github.wulkanowy.utils.toFormattedString
import javax.inject.Inject
-class MessageTabAdapter @Inject constructor() : RecyclerView.Adapter() {
+class MessageTabAdapter @Inject constructor() :
+ RecyclerView.Adapter() {
lateinit var onItemClickListener: (MessageTabDataItem.MessageItem, position: Int) -> Unit
@@ -51,11 +52,10 @@ class MessageTabAdapter @Inject constructor() : RecyclerView.Adapter HeaderViewHolder(
ItemMessageChipsBinding.inflate(inflater, parent, false)
)
-
MessageItemViewType.MESSAGE -> ItemViewHolder(
ItemMessageBinding.inflate(inflater, parent, false)
)
@@ -137,12 +137,7 @@ class MessageTabAdapter @Inject constructor() : RecyclerView.Adapter messageItemUnreadIndicator.setImageResource(R.drawable.ic_notifications_off)
- else -> messageItemUnreadIndicator.setImageResource(R.drawable.ic_circle_notification)
- }
+ messageItemUnreadIndicator.isVisible = message.unread
root.setOnClickListener {
holder.bindingAdapterPosition.let {
@@ -170,7 +165,8 @@ class MessageTabAdapter @Inject constructor() : RecyclerView.Adapter, private val new: List
+ private val old: List,
+ private val new: List
) : DiffUtil.Callback() {
override fun getOldListSize(): Int = old.size
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt
index ef640e040..c0bd4170e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt
@@ -6,7 +6,6 @@ sealed class MessageTabDataItem(val viewType: MessageItemViewType) {
data class MessageItem(
val message: Message,
- val isMuted: Boolean,
val isSelected: Boolean,
val isActionMode: Boolean
) : MessageTabDataItem(MessageItemViewType.MESSAGE)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index 12f9d3234..4364e8681 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -5,9 +5,7 @@ import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
-import android.view.View.GONE
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
+import android.view.View.*
import android.widget.CompoundButton
import androidx.annotation.StringRes
import androidx.appcompat.view.ActionMode
@@ -66,12 +64,10 @@ class MessageTabFragment : BaseFragment(R.layout.frag
}
override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
- val isTrashFolder = presenter.folder == MessageFolder.TRASHED
-
- menu.findItem(R.id.messageTabContextMenuDelete).setVisible(!isTrashFolder)
- menu.findItem(R.id.messageTabContextMenuDeleteForever).setVisible(isTrashFolder)
- menu.findItem(R.id.messageTabContextMenuRestore).setVisible(isTrashFolder)
-
+ if (presenter.folder == MessageFolder.TRASHED) {
+ val menuItem = menu.findItem(R.id.messageTabContextMenuDelete)
+ menuItem.setTitle(R.string.message_delete_forever)
+ }
return presenter.onPrepareActionMode()
}
@@ -83,8 +79,6 @@ class MessageTabFragment : BaseFragment(R.layout.frag
override fun onActionItemClicked(mode: ActionMode, menu: MenuItem): Boolean {
when (menu.itemId) {
R.id.messageTabContextMenuDelete -> presenter.onActionModeSelectDelete()
- R.id.messageTabContextMenuRestore -> presenter.onActionModeSelectRestore()
- R.id.messageTabContextMenuDeleteForever -> presenter.onActionModeSelectDelete()
R.id.messageTabContextMenuSelectAll -> presenter.onActionModeSelectCheckAll()
}
return true
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
index cda0b32bd..90f93b145 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -4,7 +4,6 @@ import io.github.wulkanowy.R
import io.github.wulkanowy.data.*
import io.github.wulkanowy.data.db.entities.Mailbox
import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageWithMutedAuthor
import io.github.wulkanowy.data.enums.MessageFolder
import io.github.wulkanowy.data.repositories.MessageRepository
import io.github.wulkanowy.data.repositories.StudentRepository
@@ -40,7 +39,7 @@ class MessageTabPresenter @Inject constructor(
private var mailboxes: List = emptyList()
private var selectedMailbox: Mailbox? = null
- private var messages = emptyList()
+ private var messages = emptyList()
private val searchChannel = Channel()
@@ -121,27 +120,8 @@ class MessageTabPresenter @Inject constructor(
return true
}
- fun onActionModeSelectRestore() {
- Timber.i("Restore ${messagesToDelete.size} messages")
- val messageList = messagesToDelete.toList()
-
- presenterScope.launch {
- view?.run {
- showProgress(true)
- showContent(false)
- showActionMode(false)
- }
- runCatching {
- val student = studentRepository.getCurrentStudent(true)
- messageRepository.restoreMessages(student, selectedMailbox, messageList)
- }
- .onFailure(errorHandler::dispatch)
- .onSuccess { view?.showMessage(R.string.message_messages_restored) }
- }
- }
-
fun onActionModeSelectDelete() {
- Timber.i("Delete ${messagesToDelete.size} messages")
+ Timber.i("Delete ${messagesToDelete.size} messages)")
val messageList = messagesToDelete.toList()
presenterScope.launch {
@@ -153,7 +133,7 @@ class MessageTabPresenter @Inject constructor(
runCatching {
val student = studentRepository.getCurrentStudent(true)
- messageRepository.deleteMessages(student, messageList)
+ messageRepository.deleteMessages(student, selectedMailbox, messageList)
}
.onFailure(errorHandler::dispatch)
.onSuccess { view?.showMessage(R.string.message_messages_deleted) }
@@ -161,7 +141,7 @@ class MessageTabPresenter @Inject constructor(
}
fun onActionModeSelectCheckAll() {
- val messagesToSelect = getFilteredData().map { it.message }
+ val messagesToSelect = getFilteredData()
val isAllSelected = messagesToDelete.containsAll(messagesToSelect)
if (isAllSelected) {
@@ -208,7 +188,7 @@ class MessageTabPresenter @Inject constructor(
view?.showActionMode(false)
}
- val filteredData = getFilteredData().map { it.message }
+ val filteredData = getFilteredData()
view?.run {
updateActionModeTitle(messagesToDelete.size)
@@ -340,31 +320,25 @@ class MessageTabPresenter @Inject constructor(
}
}
- private fun getFilteredData(): List {
+ private fun getFilteredData(): List {
if (lastSearchQuery.trim().isEmpty()) {
- val sortedMessages = messages.sortedByDescending { it.message.date }
+ val sortedMessages = messages.sortedByDescending { it.date }
return when {
- (onlyUnread == true) && onlyWithAttachments -> sortedMessages.filter {
- it.message.unread == onlyUnread && it.message.hasAttachments == onlyWithAttachments
- }
-
- (onlyUnread == true) -> sortedMessages.filter { it.message.unread == onlyUnread }
- onlyWithAttachments -> sortedMessages.filter { it.message.hasAttachments == onlyWithAttachments }
+ (onlyUnread == true) && onlyWithAttachments -> sortedMessages.filter { it.unread == onlyUnread && it.hasAttachments == onlyWithAttachments }
+ (onlyUnread == true) -> sortedMessages.filter { it.unread == onlyUnread }
+ onlyWithAttachments -> sortedMessages.filter { it.hasAttachments == onlyWithAttachments }
else -> sortedMessages
}
} else {
val sortedMessages = messages
- .map { it to calculateMatchRatio(it.message, lastSearchQuery) }
- .sortedWith(compareBy> { -it.second }.thenByDescending { it.first.message.date })
+ .map { it to calculateMatchRatio(it, lastSearchQuery) }
+ .sortedWith(compareBy> { -it.second }.thenByDescending { it.first.date })
.filter { it.second > 6000 }
.map { it.first }
return when {
- (onlyUnread == true) && onlyWithAttachments -> sortedMessages.filter {
- it.message.unread == onlyUnread && it.message.hasAttachments == onlyWithAttachments
- }
-
- (onlyUnread == true) -> sortedMessages.filter { it.message.unread == onlyUnread }
- onlyWithAttachments -> sortedMessages.filter { it.message.hasAttachments == onlyWithAttachments }
+ (onlyUnread == true) && onlyWithAttachments -> sortedMessages.filter { it.unread == onlyUnread && it.hasAttachments == onlyWithAttachments }
+ (onlyUnread == true) -> sortedMessages.filter { it.unread == onlyUnread }
+ onlyWithAttachments -> sortedMessages.filter { it.hasAttachments == onlyWithAttachments }
else -> sortedMessages
}
}
@@ -393,9 +367,8 @@ class MessageTabPresenter @Inject constructor(
addAll(data.map { message ->
MessageTabDataItem.MessageItem(
- message = message.message,
- isMuted = message.mutedMessageSender != null,
- isSelected = messagesToDelete.any { it.messageGlobalKey == message.message.messageGlobalKey },
+ message = message,
+ isSelected = messagesToDelete.any { it.messageGlobalKey == message.messageGlobalKey },
isActionMode = isActionMode
)
})
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
index 731488a9c..46999599b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
@@ -2,7 +2,6 @@ package io.github.wulkanowy.ui.modules.schoolannouncement
import android.view.LayoutInflater
import android.view.ViewGroup
-import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView
import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
import io.github.wulkanowy.databinding.ItemSchoolAnnouncementBinding
@@ -30,10 +29,6 @@ class SchoolAnnouncementAdapter @Inject constructor() :
schoolAnnouncementItemDate.text = item.date.toFormattedString()
schoolAnnouncementItemType.text = item.subject
schoolAnnouncementItemContent.text = item.content.parseUonetHtml()
- with(schoolAnnouncementItemAuthor) {
- text = item.author
- isVisible = !item.author.isNullOrBlank()
- }
root.setOnClickListener { onItemClickListener(item) }
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
index 62544f83e..3d0c8052b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
@@ -3,9 +3,7 @@ package io.github.wulkanowy.ui.modules.settings.appearance
import android.content.SharedPreferences
import android.os.Bundle
import android.view.View
-import androidx.core.os.bundleOf
import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SeekBarPreference
import com.yariksoffice.lingver.Lingver
import dagger.hilt.android.AndroidEntryPoint
import io.github.wulkanowy.R
@@ -31,31 +29,13 @@ class AppearanceFragment : PreferenceFragmentCompat(),
override val titleStringId get() = R.string.pref_settings_appearance_title
- companion object {
- fun withFocusedPreference(key: String) = AppearanceFragment().apply {
- arguments = bundleOf(FOCUSED_KEY to key)
- }
-
- private const val FOCUSED_KEY = "focusedKey"
- }
-
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
presenter.onAttachView(this)
- arguments?.getString(FOCUSED_KEY)?.let { scrollToPreference(it) }
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.scheme_preferences_appearance, rootKey)
- val attendanceTargetPref =
- findPreference(requireContext().getString(R.string.pref_key_attendance_target))!!
- attendanceTargetPref.setOnPreferenceChangeListener { _, newValueObj ->
- val newValue = (((newValueObj as Int).toDouble() + 2.5) / 5).toInt() * 5
- attendanceTargetPref.value =
- newValue.coerceIn(attendanceTargetPref.min, attendanceTargetPref.max)
-
- false
- }
}
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
index 5cb6c401f..a957ef798 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
@@ -7,28 +7,27 @@ import android.view.ViewGroup
import android.widget.TextView
import androidx.core.view.isVisible
import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import io.github.wulkanowy.R
import io.github.wulkanowy.data.db.entities.Timetable
import io.github.wulkanowy.databinding.ItemTimetableBinding
import io.github.wulkanowy.databinding.ItemTimetableEmptyBinding
-import io.github.wulkanowy.databinding.ItemTimetableMainAdditionalBinding
import io.github.wulkanowy.databinding.ItemTimetableSmallBinding
-import io.github.wulkanowy.utils.SyncListAdapter
import io.github.wulkanowy.utils.getPlural
import io.github.wulkanowy.utils.getThemeAttrColor
import io.github.wulkanowy.utils.toFormattedString
import javax.inject.Inject
class TimetableAdapter @Inject constructor() :
- SyncListAdapter(Differ) {
+ ListAdapter(differ) {
override fun getItemViewType(position: Int): Int = getItem(position).type.ordinal
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
val inflater = LayoutInflater.from(parent.context)
- return when (TimetableItemType.entries[viewType]) {
+ return when (TimetableItemType.values()[viewType]) {
TimetableItemType.SMALL -> SmallViewHolder(
ItemTimetableSmallBinding.inflate(inflater, parent, false)
)
@@ -40,10 +39,6 @@ class TimetableAdapter @Inject constructor() :
TimetableItemType.EMPTY -> EmptyViewHolder(
ItemTimetableEmptyBinding.inflate(inflater, parent, false)
)
-
- TimetableItemType.ADDITIONAL -> AdditionalViewHolder(
- ItemTimetableMainAdditionalBinding.inflate(inflater, parent, false)
- )
}
}
@@ -66,30 +61,16 @@ class TimetableAdapter @Inject constructor() :
binding = holder.binding,
item = getItem(position) as TimetableItem.Small,
)
+
is NormalViewHolder -> bindNormalView(
binding = holder.binding,
item = getItem(position) as TimetableItem.Normal,
)
+
is EmptyViewHolder -> bindEmptyView(
binding = holder.binding,
item = getItem(position) as TimetableItem.Empty,
)
-
- is AdditionalViewHolder -> bindAdditionalView(
- binding = holder.binding,
- item = getItem(position) as TimetableItem.Additional,
- )
- }
- }
-
- private fun bindAdditionalView(
- binding: ItemTimetableMainAdditionalBinding,
- item: TimetableItem.Additional
- ) {
- with(binding) {
- timetableItemSubject.text = item.additional.subject
- timetableItemTimeStart.text = item.additional.start.toFormattedString("HH:mm")
- timetableItemTimeFinish.text = item.additional.end.toFormattedString("HH:mm")
}
}
@@ -98,7 +79,6 @@ class TimetableAdapter @Inject constructor() :
with(binding) {
timetableSmallItemNumber.text = lesson.number.toString()
- timetableSmallItemNumber.isVisible = item.isLessonNumberVisible
timetableSmallItemSubject.text = lesson.subject
timetableSmallItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
timetableSmallItemRoom.text = lesson.room
@@ -117,7 +97,6 @@ class TimetableAdapter @Inject constructor() :
with(binding) {
timetableItemNumber.text = lesson.number.toString()
- timetableItemNumber.isVisible = item.isLessonNumberVisible
timetableItemSubject.text = lesson.subject
timetableItemGroup.text = lesson.group
timetableItemRoom.text = lesson.room
@@ -326,32 +305,31 @@ class TimetableAdapter @Inject constructor() :
private class EmptyViewHolder(val binding: ItemTimetableEmptyBinding) :
RecyclerView.ViewHolder(binding.root)
- private class AdditionalViewHolder(val binding: ItemTimetableMainAdditionalBinding) :
- RecyclerView.ViewHolder(binding.root)
+ companion object {
+ private val differ = object : DiffUtil.ItemCallback() {
+ override fun areItemsTheSame(oldItem: TimetableItem, newItem: TimetableItem): Boolean =
+ when {
+ oldItem is TimetableItem.Small && newItem is TimetableItem.Small -> {
+ oldItem.lesson.start == newItem.lesson.start
+ }
- private object Differ : DiffUtil.ItemCallback() {
- override fun areItemsTheSame(oldItem: TimetableItem, newItem: TimetableItem): Boolean =
- when {
- oldItem is TimetableItem.Small && newItem is TimetableItem.Small -> {
- oldItem.lesson.start == newItem.lesson.start
+ oldItem is TimetableItem.Normal && newItem is TimetableItem.Normal -> {
+ oldItem.lesson.start == newItem.lesson.start
+ }
+
+ else -> oldItem == newItem
}
- oldItem is TimetableItem.Normal && newItem is TimetableItem.Normal -> {
- oldItem.lesson.start == newItem.lesson.start
- }
+ override fun areContentsTheSame(oldItem: TimetableItem, newItem: TimetableItem) =
+ oldItem == newItem
- else -> oldItem == newItem
- }
-
- override fun areContentsTheSame(oldItem: TimetableItem, newItem: TimetableItem) =
- oldItem == newItem
-
- override fun getChangePayload(oldItem: TimetableItem, newItem: TimetableItem): Any? {
- return if (oldItem is TimetableItem.Normal && newItem is TimetableItem.Normal) {
- if (oldItem.lesson == newItem.lesson && oldItem.showGroupsInPlan == newItem.showGroupsInPlan && oldItem.timeLeft != newItem.timeLeft) {
- "time_left"
+ override fun getChangePayload(oldItem: TimetableItem, newItem: TimetableItem): Any? {
+ return if (oldItem is TimetableItem.Normal && newItem is TimetableItem.Normal) {
+ if (oldItem.lesson == newItem.lesson && oldItem.showGroupsInPlan == newItem.showGroupsInPlan && oldItem.timeLeft != newItem.timeLeft) {
+ "time_left"
+ } else super.getChangePayload(oldItem, newItem)
} else super.getChangePayload(oldItem, newItem)
- } else super.getChangePayload(oldItem, newItem)
+ }
}
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index b73e7c26d..0e6459110 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -21,11 +21,7 @@ import io.github.wulkanowy.ui.modules.main.MainView
import io.github.wulkanowy.ui.modules.timetable.additional.AdditionalLessonsFragment
import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.firstSchoolDayInSchoolYear
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.lastSchoolDayInSchoolYear
-import io.github.wulkanowy.utils.openMaterialDatePicker
+import io.github.wulkanowy.utils.*
import java.time.LocalDate
import javax.inject.Inject
@@ -108,11 +104,8 @@ class TimetableFragment : BaseFragment(R.layout.fragme
}
}
- override fun updateData(data: List, isDayChanged: Boolean) {
- when {
- isDayChanged -> timetableAdapter.recreate(data)
- else -> timetableAdapter.submitList(data)
- }
+ override fun updateData(data: List) {
+ timetableAdapter.submitList(data)
}
override fun clearData() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
index 93290ba21..105ece38c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
@@ -1,21 +1,18 @@
package io.github.wulkanowy.ui.modules.timetable
import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
import java.time.Duration
sealed class TimetableItem(val type: TimetableItemType) {
data class Small(
val lesson: Timetable,
- val isLessonNumberVisible: Boolean,
val onClick: (Timetable) -> Unit,
) : TimetableItem(TimetableItemType.SMALL)
data class Normal(
val lesson: Timetable,
val showGroupsInPlan: Boolean,
- val isLessonNumberVisible: Boolean,
val timeLeft: TimeLeft?,
val onClick: (Timetable) -> Unit,
) : TimetableItem(TimetableItemType.NORMAL)
@@ -24,10 +21,6 @@ sealed class TimetableItem(val type: TimetableItemType) {
val numFrom: Int,
val numTo: Int
) : TimetableItem(TimetableItemType.EMPTY)
-
- data class Additional(
- val additional: TimetableAdditional,
- ) : TimetableItem(TimetableItemType.ADDITIONAL)
}
data class TimeLeft(
@@ -39,6 +32,5 @@ data class TimeLeft(
enum class TimetableItemType {
SMALL,
NORMAL,
- EMPTY,
- ADDITIONAL,
+ EMPTY
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index c00bdc3e4..7e8c876ef 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -3,10 +3,8 @@ package io.github.wulkanowy.ui.modules.timetable
import android.os.Handler
import android.os.Looper
import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.data.enums.ShowAdditionalLessonsMode.BELOW
-import io.github.wulkanowy.data.enums.ShowAdditionalLessonsMode.NONE
import io.github.wulkanowy.data.enums.TimetableGapsMode.BETWEEN_AND_BEFORE_LESSONS
import io.github.wulkanowy.data.enums.TimetableGapsMode.NO_GAPS
import io.github.wulkanowy.data.enums.TimetableMode
@@ -17,7 +15,6 @@ import io.github.wulkanowy.data.onResourceError
import io.github.wulkanowy.data.onResourceIntermediate
import io.github.wulkanowy.data.onResourceNotLoading
import io.github.wulkanowy.data.onResourceSuccess
-import io.github.wulkanowy.data.pojos.TimetableFull
import io.github.wulkanowy.data.repositories.PreferencesRepository
import io.github.wulkanowy.data.repositories.SemesterRepository
import io.github.wulkanowy.data.repositories.StudentRepository
@@ -61,7 +58,6 @@ class TimetablePresenter @Inject constructor(
private var initialDate: LocalDate? = null
private var isWeekendHasLessons: Boolean = false
- private var isEduOne: Boolean = false
var currentDate: LocalDate? = null
private set
@@ -85,7 +81,7 @@ class TimetablePresenter @Inject constructor(
} else currentDate?.previousSchoolDay
reloadView(date ?: return)
- loadData(isDayChanged = true)
+ loadData()
}
fun onNextDay() {
@@ -94,7 +90,7 @@ class TimetablePresenter @Inject constructor(
} else currentDate?.nextSchoolDay
reloadView(date ?: return)
- loadData(isDayChanged = true)
+ loadData()
}
fun onPickDate() {
@@ -108,7 +104,7 @@ class TimetablePresenter @Inject constructor(
fun onSwipeRefresh() {
Timber.i("Force refreshing the timetable")
- loadData(forceRefresh = true)
+ loadData(true)
}
fun onRetry() {
@@ -116,7 +112,7 @@ class TimetablePresenter @Inject constructor(
showErrorView(false)
showProgress(true)
}
- loadData(forceRefresh = true)
+ loadData(true)
}
fun onDetailsClick() {
@@ -149,13 +145,12 @@ class TimetablePresenter @Inject constructor(
return true
}
- private fun loadData(forceRefresh: Boolean = false, isDayChanged: Boolean = false) {
+ private fun loadData(forceRefresh: Boolean = false) {
flatResourceFlow {
val student = studentRepository.getCurrentStudent()
val semester = semesterRepository.getCurrentSemester(student)
- isEduOne = student.isEduOne == true
- checkInitialAndCurrentDate(semester)
+ checkInitialAndCurrentDate(student, semester)
timetableRepository.getTimetable(
student = student,
semester = semester,
@@ -173,9 +168,9 @@ class TimetablePresenter @Inject constructor(
enableSwipe(true)
showProgress(false)
showErrorView(false)
- updateData(it, isDayChanged)
- showContent(it.lessons.isNotEmpty() || it.additional.isNotEmpty())
- showEmpty(it.lessons.isEmpty() && it.additional.isEmpty())
+ showContent(it.lessons.isNotEmpty())
+ showEmpty(it.lessons.isEmpty())
+ updateData(it.lessons)
setDayHeaderMessage(it.headers.find { header -> header.date == currentDate }?.content)
reloadNavigation()
}
@@ -199,9 +194,9 @@ class TimetablePresenter @Inject constructor(
.launch()
}
- private suspend fun checkInitialAndCurrentDate(semester: Semester) {
+ private suspend fun checkInitialAndCurrentDate(student: Student, semester: Semester) {
if (initialDate == null) {
- isWeekendHasLessons = isStudentHasLessonsOnWeekendUseCase(semester)
+ isWeekendHasLessons = isStudentHasLessonsOnWeekendUseCase(student, semester)
initialDate = getInitialDate(semester)
}
@@ -220,97 +215,66 @@ class TimetablePresenter @Inject constructor(
}
}
- private fun updateData(lessons: TimetableFull, isDayChanged: Boolean) {
+ private fun updateData(lessons: List) {
tickTimer?.cancel()
- view?.updateData(createItems(lessons), isDayChanged)
- if (currentDate == now()) {
- tickTimer = timer(period = 2_000, initialDelay = 2_000) {
+ if (currentDate != now()) {
+ view?.updateData(createItems(lessons))
+ } else {
+ tickTimer = timer(period = 2_000) {
Handler(Looper.getMainLooper()).post {
- view?.updateData(createItems(lessons), isDayChanged)
+ view?.updateData(createItems(lessons))
}
}
}
}
- private sealed class Item(
- val isStudentPlan: Boolean,
- val start: Instant,
- val number: Int?,
- ) {
- class Lesson(val lesson: Timetable) :
- Item(lesson.isStudentPlan, lesson.start, lesson.number)
-
- class Additional(val additional: TimetableAdditional) : Item(true, additional.start, null)
- }
-
- private fun createItems(fullTimetable: TimetableFull): List {
- val showAdditionalLessonsInPlan = prefRepository.showAdditionalLessonsInPlan
- val allItems =
- fullTimetable.lessons.map(Item::Lesson) + fullTimetable.additional.map(Item::Additional)
- .takeIf { showAdditionalLessonsInPlan != NONE }.orEmpty()
-
- val filteredItems = allItems.filter {
- if (prefRepository.showWholeClassPlan == TimetableMode.ONLY_CURRENT_GROUP) {
- it.isStudentPlan
- } else true
- }.sortedWith(
- (compareBy- { it is Item.Additional }
- .takeIf { showAdditionalLessonsInPlan == BELOW } ?: EmptyComparator())
- .thenBy { it.start }
- .thenBy { !it.isStudentPlan }
- )
+ private fun createItems(items: List): List {
+ val filteredItems = items
+ .filter {
+ if (prefRepository.showWholeClassPlan == TimetableMode.ONLY_CURRENT_GROUP) {
+ it.isStudentPlan
+ } else true
+ }.sortedWith(
+ compareBy({ item -> item.number }, { item -> !item.isStudentPlan })
+ )
var prevNum = when (prefRepository.showTimetableGaps) {
BETWEEN_AND_BEFORE_LESSONS -> 0
else -> null
}
- var prevIsAdditional = false
return buildList {
filteredItems.forEachIndexed { i, it ->
- if (prefRepository.showTimetableGaps != NO_GAPS) {
- if (prevNum != null && it.number != null && it.number > prevNum!! + 1) {
- if (!prevIsAdditional) {
- // Additional lessons do count as a lesson so don't add empty lessons
- // when there is an additional lesson present
- val emptyLesson = TimetableItem.Empty(
- numFrom = prevNum!! + 1, numTo = it.number - 1
- )
- add(emptyLesson)
- }
- }
- prevNum = it.number
- prevIsAdditional = it is Item.Additional
+ if (prefRepository.showTimetableGaps != NO_GAPS && prevNum != null && it.number > prevNum!! + 1) {
+ val emptyLesson = TimetableItem.Empty(
+ numFrom = prevNum!! + 1,
+ numTo = it.number - 1
+ )
+ add(emptyLesson)
}
- if (it is Item.Lesson) {
- if (it.isStudentPlan) {
- val normalLesson = TimetableItem.Normal(
- lesson = it.lesson,
- showGroupsInPlan = prefRepository.showGroupsInPlan,
- timeLeft = filteredItems.getTimeLeftForLesson(it.lesson, i),
- onClick = ::onTimetableItemSelected,
- isLessonNumberVisible = !isEduOne
- )
- add(normalLesson)
- } else {
- val smallLesson = TimetableItem.Small(
- lesson = it.lesson,
- onClick = ::onTimetableItemSelected,
- isLessonNumberVisible = !isEduOne
- )
- add(smallLesson)
- }
- } else if (it is Item.Additional) {
- // If the user disabled showing additional lessons, they would've been filtered
- // out already, so there's no need to check it again.
- add(TimetableItem.Additional(it.additional))
+ if (it.isStudentPlan) {
+ val normalLesson = TimetableItem.Normal(
+ lesson = it,
+ showGroupsInPlan = prefRepository.showGroupsInPlan,
+ timeLeft = filteredItems.getTimeLeftForLesson(it, i),
+ onClick = ::onTimetableItemSelected
+ )
+ add(normalLesson)
+ } else {
+ val smallLesson = TimetableItem.Small(
+ lesson = it,
+ onClick = ::onTimetableItemSelected
+ )
+ add(smallLesson)
}
+
+ prevNum = it.number
}
}
}
- private fun List
- .getTimeLeftForLesson(lesson: Timetable, index: Int): TimeLeft {
+ private fun List.getTimeLeftForLesson(lesson: Timetable, index: Int): TimeLeft {
val isShowTimeUntil = lesson.isShowTimeUntil(getPreviousLesson(index))
return TimeLeft(
until = lesson.until.plusMinutes(1).takeIf { isShowTimeUntil },
@@ -319,20 +283,11 @@ class TimetablePresenter @Inject constructor(
)
}
- private fun List
- .getPreviousLesson(position: Int): Instant? {
- val lessonAdditionalOffset = filterIndexed { i, item ->
- i < position && item is Item.Additional
- }.size
- val lessonStudentPlanOffset = filterIndexed { i, item ->
- i < position && !item.isStudentPlan
- }.size
- val lessonIndex = position - 1 - lessonAdditionalOffset - lessonStudentPlanOffset
-
- return filterIsInstance()
- .filter { it.isStudentPlan }
- .getOrNull(lessonIndex)
+ private fun List.getPreviousLesson(position: Int): Instant? {
+ return filter { it.isStudentPlan }
+ .getOrNull(position - 1 - filterIndexed { i, item -> i < position && !item.isStudentPlan }.size)
?.let {
- if (!it.lesson.canceled && it.isStudentPlan) it.lesson.end
+ if (!it.canceled && it.isStudentPlan) it.end
else null
}
}
@@ -385,7 +340,3 @@ class TimetablePresenter @Inject constructor(
super.onDetachView()
}
}
-
-private class EmptyComparator : Comparator {
- override fun compare(o1: T, o2: T) = 0
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
index f4d5b7621..40190d51f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
@@ -12,7 +12,7 @@ interface TimetableView : BaseView {
fun initView()
- fun updateData(data: List, isDayChanged: Boolean)
+ fun updateData(data: List)
fun updateNavigationDay(date: String)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
index bf6be56f6..faa833c20 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
@@ -13,11 +13,7 @@ import io.github.wulkanowy.ui.modules.main.MainActivity
import io.github.wulkanowy.ui.modules.main.MainView
import io.github.wulkanowy.ui.modules.timetable.additional.add.AdditionalLessonAddDialog
import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.firstSchoolDayInSchoolYear
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.lastSchoolDayInSchoolYear
-import io.github.wulkanowy.utils.openMaterialDatePicker
+import io.github.wulkanowy.utils.*
import java.time.LocalDate
import javax.inject.Inject
@@ -136,12 +132,8 @@ class AdditionalLessonsFragment :
binding.additionalLessonsNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
}
- override fun showAddAdditionalLessonDialog(currentDate: LocalDate) {
- (activity as? MainActivity)?.showDialogFragment(
- AdditionalLessonAddDialog.newInstance(
- currentDate
- )
- )
+ override fun showAddAdditionalLessonDialog() {
+ (activity as? MainActivity)?.showDialogFragment(AdditionalLessonAddDialog.newInstance())
}
override fun showDatePickerDialog(selectedDate: LocalDate) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
index 16ec9746f..d0a01b38c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
@@ -1,27 +1,14 @@
package io.github.wulkanowy.ui.modules.timetable.additional
import android.annotation.SuppressLint
+import io.github.wulkanowy.data.*
import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.data.flatResourceFlow
-import io.github.wulkanowy.data.logResourceStatus
-import io.github.wulkanowy.data.onResourceData
-import io.github.wulkanowy.data.onResourceError
-import io.github.wulkanowy.data.onResourceNotLoading
-import io.github.wulkanowy.data.onResourceSuccess
import io.github.wulkanowy.data.repositories.SemesterRepository
import io.github.wulkanowy.data.repositories.StudentRepository
import io.github.wulkanowy.data.repositories.TimetableRepository
-import io.github.wulkanowy.domain.timetable.IsStudentHasLessonsOnWeekendUseCase
import io.github.wulkanowy.ui.base.BasePresenter
import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.capitalise
-import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
-import io.github.wulkanowy.utils.isHolidays
-import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import io.github.wulkanowy.utils.nextSchoolDay
-import io.github.wulkanowy.utils.previousSchoolDay
-import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.*
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.onEach
@@ -35,14 +22,11 @@ class AdditionalLessonsPresenter @Inject constructor(
errorHandler: ErrorHandler,
private val semesterRepository: SemesterRepository,
private val timetableRepository: TimetableRepository,
- private val isStudentHasLessonsOnWeekendUseCase: IsStudentHasLessonsOnWeekendUseCase,
private val analytics: AnalyticsHelper
) : BasePresenter(errorHandler, studentRepository) {
private var baseDate: LocalDate = LocalDate.now().nextOrSameSchoolDay
- private var isWeekendHasLessons: Boolean = false
-
lateinit var currentDate: LocalDate
private set
@@ -59,18 +43,12 @@ class AdditionalLessonsPresenter @Inject constructor(
}
fun onPreviousDay() {
- val date = if (isWeekendHasLessons) {
- currentDate.minusDays(1)
- } else currentDate.previousSchoolDay
- loadData(date)
+ loadData(currentDate.previousSchoolDay)
reloadView()
}
fun onNextDay() {
- val date = if (isWeekendHasLessons) {
- currentDate.plusDays(1)
- } else currentDate.nextSchoolDay
- loadData(date)
+ loadData(currentDate.nextSchoolDay)
reloadView()
}
@@ -79,7 +57,7 @@ class AdditionalLessonsPresenter @Inject constructor(
}
fun onAdditionalLessonAddButtonClicked() {
- view?.showAddAdditionalLessonDialog(currentDate)
+ view?.showAddAdditionalLessonDialog()
}
fun onDateSet(year: Int, month: Int, day: Int) {
@@ -153,8 +131,6 @@ class AdditionalLessonsPresenter @Inject constructor(
flatResourceFlow {
val student = studentRepository.getCurrentStudent()
val semester = semesterRepository.getCurrentSemester(student)
-
- isWeekendHasLessons = isStudentHasLessonsOnWeekendUseCase(semester, currentDate)
timetableRepository.getTimetable(
student = student,
semester = semester,
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsView.kt
index 291c12172..76d37b754 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsView.kt
@@ -36,7 +36,7 @@ interface AdditionalLessonsView : BaseView {
fun showDatePickerDialog(selectedDate: LocalDate)
- fun showAddAdditionalLessonDialog(currentDate: LocalDate)
+ fun showAddAdditionalLessonDialog()
fun showSuccessMessage()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt
index 9470c910f..134719979 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.ui.modules.timetable.additional.add
import android.app.Dialog
import android.os.Bundle
import android.view.View
-import androidx.core.os.bundleOf
import androidx.core.widget.doOnTextChanged
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.timepicker.MaterialTimePicker
@@ -27,12 +26,10 @@ class AdditionalLessonAddDialog : BaseDialogFragment
lateinit var presenter: AdditionalLessonAddPresenter
companion object {
- const val ARGUMENT_KEY = "additional_lesson_default_date"
- fun newInstance(defaultDate: LocalDate) = AdditionalLessonAddDialog().apply {
- arguments = bundleOf(ARGUMENT_KEY to defaultDate.toEpochDay())
- }
+ fun newInstance() = AdditionalLessonAddDialog()
}
+
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
return MaterialAlertDialogBuilder(requireContext(), theme)
.setView(
@@ -43,13 +40,10 @@ class AdditionalLessonAddDialog : BaseDialogFragment
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- arguments?.getLong(ARGUMENT_KEY)?.let(LocalDate::ofEpochDay)?.let {
- presenter.onDateSelected(it)
- }
presenter.onAttachView(this)
}
- override fun initView(selectedDate: LocalDate) {
+ override fun initView() {
with(binding) {
additionalLessonDialogStartEdit.doOnTextChanged { _, _, _, _ ->
additionalLessonDialogStart.isErrorEnabled = false
@@ -59,7 +53,6 @@ class AdditionalLessonAddDialog : BaseDialogFragment
additionalLessonDialogEnd.isErrorEnabled = false
additionalLessonDialogEnd.error = null
}
- additionalLessonDialogDateEdit.setText(selectedDate.toFormattedString())
additionalLessonDialogDateEdit.doOnTextChanged { _, _, _, _ ->
additionalLessonDialogDate.isErrorEnabled = false
additionalLessonDialogDate.error = null
@@ -68,6 +61,7 @@ class AdditionalLessonAddDialog : BaseDialogFragment
additionalLessonDialogContent.isErrorEnabled = false
additionalLessonDialogContent.error = null
}
+
additionalLessonDialogAdd.setOnClickListener {
presenter.onAddAdditionalClicked(
start = additionalLessonDialogStartEdit.text?.toString(),
@@ -161,9 +155,7 @@ class AdditionalLessonAddDialog : BaseDialogFragment
.build()
timePicker.addOnPositiveButtonClickListener {
- if (isAdded) {
- onTimeSelected(LocalTime.of(timePicker.hour, timePicker.minute))
- }
+ onTimeSelected(LocalTime.of(timePicker.hour, timePicker.minute))
}
if (!parentFragmentManager.isStateSaved) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddPresenter.kt
index db59a2ab5..c207165d3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddPresenter.kt
@@ -10,12 +10,9 @@ import io.github.wulkanowy.utils.lastSchoolDayInSchoolYear
import io.github.wulkanowy.utils.toLocalDate
import kotlinx.coroutines.launch
import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalTime
-import java.time.ZoneId
-import java.time.ZonedDateTime
+import java.time.*
import java.time.temporal.ChronoUnit
-import java.util.UUID
+import java.util.*
import javax.inject.Inject
class AdditionalLessonAddPresenter @Inject constructor(
@@ -33,7 +30,7 @@ class AdditionalLessonAddPresenter @Inject constructor(
override fun onAttachView(view: AdditionalLessonAddView) {
super.onAttachView(view)
- view.initView(selectedDate)
+ view.initView()
Timber.i("AdditionalLesson details view was initialized")
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddView.kt
index 8d9678e7b..0df53815b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddView.kt
@@ -6,7 +6,7 @@ import java.time.LocalTime
interface AdditionalLessonAddView : BaseView {
- fun initView(selectedDate: LocalDate)
+ fun initView()
fun closeDialog()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
index e60d54880..4e0578e2b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
@@ -11,7 +11,7 @@ import android.view.View.VISIBLE
import android.widget.RemoteViews
import android.widget.RemoteViewsService
import io.github.wulkanowy.R
-import io.github.wulkanowy.data.dataOrThrow
+import io.github.wulkanowy.data.dataOrNull
import io.github.wulkanowy.data.db.SharedPrefProvider
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
@@ -27,7 +27,6 @@ import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Co
import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getTodayLastLessonEndDateTimeWidgetKey
import io.github.wulkanowy.utils.getCompatColor
-import io.github.wulkanowy.utils.getErrorString
import io.github.wulkanowy.utils.getPlural
import io.github.wulkanowy.utils.toFormattedString
import kotlinx.coroutines.runBlocking
@@ -46,8 +45,11 @@ class TimetableWidgetFactory(
) : RemoteViewsService.RemoteViewsFactory {
private var items = emptyList()
+
private var timetableCanceledColor: Int? = null
+
private var textColor: Int? = null
+
private var timetableChangeColor: Int? = null
override fun getLoadingView() = null
@@ -65,31 +67,25 @@ class TimetableWidgetFactory(
override fun onDestroy() {}
override fun onDataSetChanged() {
- val appWidgetId = intent?.extras?.getInt(EXTRA_APPWIDGET_ID) ?: return
- val date = LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(appWidgetId), 0))
- val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
+ intent?.extras?.getInt(EXTRA_APPWIDGET_ID)?.let { appWidgetId ->
+ val date = LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(appWidgetId), 0))
+ val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
- items = emptyList()
-
- runBlocking {
runCatching {
- val student = getStudent(studentId) ?: return@runBlocking
- val semester = semesterRepository.getCurrentSemester(student)
- val lessons = getLessons(student, semester, date)
- val lastSync = timetableRepository.getLastRefreshTimestamp(semester, date, date)
-
- createItems(lessons, lastSync, !(student.isEduOne ?: false))
- }
- .onFailure {
- items = listOf(TimetableWidgetItem.Error(it))
- Timber.e(it, "An error has occurred in timetable widget factory")
- }
- .onSuccess {
- items = it
+ runBlocking {
+ val student = getStudent(studentId) ?: return@runBlocking
+ val semester = semesterRepository.getCurrentSemester(student)
+ items = createItems(
+ lessons = getLessons(student, semester, date),
+ lastSync = timetableRepository.getLastRefreshTimestamp(semester, date, date)
+ )
if (date == LocalDate.now()) {
updateTodayLastLessonEnd(appWidgetId)
}
}
+ }.onFailure {
+ Timber.e(it, "An error has occurred in timetable widget factory")
+ }
}
}
@@ -101,28 +97,19 @@ class TimetableWidgetFactory(
private suspend fun getLessons(
student: Student, semester: Semester, date: LocalDate
): List {
- val timetable = timetableRepository.getTimetable(
- student = student,
- semester = semester,
- start = date,
- end = date,
- forceRefresh = false,
- isFromAppWidget = true
- )
- val lessons = timetable.toFirstResult().dataOrThrow.lessons
- return lessons.sortedBy { it.start }
+ val timetable = timetableRepository.getTimetable(student, semester, date, date, false)
+ val lessons = timetable.toFirstResult().dataOrNull?.lessons.orEmpty()
+ return lessons.sortedBy { it.number }
}
private fun createItems(
lessons: List,
lastSync: Instant?,
- isEduOne: Boolean
): List