? = null
+
private lateinit var lastError: Throwable
private var retryCallback: () -> Unit = {}
@@ -56,6 +64,7 @@ class MessagePreviewPresenter @Inject constructor(
.subscribe({ message ->
Timber.i("Loading message ${message.message.messageId} preview result: Success ")
this@MessagePreviewPresenter.message = message.message
+ this@MessagePreviewPresenter.attachments = message.attachments
view?.apply {
setMessageWithAttachment(message)
initOptions()
@@ -87,6 +96,60 @@ class MessagePreviewPresenter @Inject constructor(
} else false
}
+ fun onShare(): Boolean {
+ message?.let {
+ var text = "Temat: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }}\n" + when (it.sender.isNotEmpty()) {
+ true -> "Od: ${it.sender}\n"
+ false -> "Do: ${it.recipient}\n"
+ } + "Data: ${it.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}\n\n${it.content}"
+
+ attachments?.let { attachments ->
+ if (attachments.isNotEmpty()) {
+ text += "\n\nZałączniki:"
+
+ attachments.forEach { attachment ->
+ text += "\n${attachment.filename}: ${attachment.url}"
+ }
+ }
+ }
+
+ view?.shareText(text, "FW: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }}")
+ return true
+ }
+ return false
+ }
+
+ @SuppressLint("NewApi")
+ fun onPrint(): Boolean {
+ if (appInfo.systemVersion < Build.VERSION_CODES.LOLLIPOP) return false
+ message?.let {
+ val dateString = it.date.toFormattedString("yyyy-MM-dd HH:mm:ss")
+ val infoContent = "Data wysłania
$dateString" + when {
+ it.sender.isNotEmpty() -> "Od
${it.sender}"
+ else -> "Do
${it.recipient}"
+ }
+
+ val messageContent = "${it.content}
"
+ .replace(Regex("[\\n\\r]{2,}"), "")
+ .replace(Regex("[\\n\\r]"), "
")
+
+ val jobName = "Wiadomość " + when {
+ it.sender.isNotEmpty() -> "od ${it.sender}"
+ else -> "do ${it.recipient}"
+ } + " $dateString: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }} | Wulkanowy"
+
+ view?.apply {
+ val html = printHTML
+ .replace("%SUBJECT%", it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() })
+ .replace("%CONTENT%", messageContent)
+ .replace("%INFO%", infoContent)
+ printDocument(html, jobName)
+ }
+ return true
+ }
+ return false
+ }
+
private fun deleteMessage() {
message?.let { message ->
disposable.add(studentRepository.getCurrentStudent()
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 3d620459..0fdb4bda 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
@@ -1,5 +1,7 @@
package io.github.wulkanowy.ui.modules.message.preview
+import android.os.Build
+import androidx.annotation.RequiresApi
import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.db.entities.MessageWithAttachment
import io.github.wulkanowy.ui.base.BaseView
@@ -8,6 +10,10 @@ interface MessagePreviewView : BaseView {
val deleteMessageSuccessString: String
+ val messageNoSubjectString: String
+
+ val printHTML: String
+
fun initView()
fun setMessageWithAttachment(item: MessageWithAttachment)
@@ -34,5 +40,10 @@ interface MessagePreviewView : BaseView {
fun openMessageForward(message: Message?)
+ fun shareText(text: String, subject: String)
+
+ @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+ fun printDocument(html: String, jobName: String)
+
fun popView()
}
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 ece6773f..b58508a9 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
@@ -4,10 +4,9 @@ import android.graphics.Typeface
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.NO_POSITION
-import androidx.recyclerview.widget.SortedList
-import androidx.recyclerview.widget.SortedListAdapterCallback
import io.github.wulkanowy.R
import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.repositories.message.MessageFolder
@@ -20,39 +19,23 @@ class MessageTabAdapter @Inject constructor() :
var onClickListener: (Message, position: Int) -> Unit = { _, _ -> }
- private val items = SortedList(Message::class.java, object :
- SortedListAdapterCallback(this) {
+ private var items = mutableListOf()
- override fun compare(item1: Message, item2: Message): Int {
- return item2.date.compareTo(item1.date)
- }
-
- override fun areContentsTheSame(oldItem: Message?, newItem: Message?): Boolean {
- return oldItem == newItem
- }
-
- override fun areItemsTheSame(item1: Message, item2: Message): Boolean {
- return item1 == item2
- }
- })
-
- fun replaceAll(models: List) {
- items.beginBatchedUpdates()
- for (i in items.size() - 1 downTo 0) {
- val model = items.get(i)
- if (model !in models) {
- items.remove(model)
- }
- }
- items.addAll(models)
- items.endBatchedUpdates()
+ fun setDataItems(data: List) {
+ val diffResult = DiffUtil.calculateDiff(MessageTabDiffUtil(items, data))
+ items = data.toMutableList()
+ diffResult.dispatchUpdatesTo(this)
}
fun updateItem(position: Int, item: Message) {
- items.updateItemAt(position, item)
+ val currentItem = items[position]
+ items[position] = item
+ if (item != currentItem) {
+ notifyItemChanged(position)
+ }
}
- override fun getItemCount() = items.size()
+ override fun getItemCount() = items.size
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
ItemMessageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -85,4 +68,19 @@ class MessageTabAdapter @Inject constructor() :
}
class ItemViewHolder(val binding: ItemMessageBinding) : RecyclerView.ViewHolder(binding.root)
+
+ private class MessageTabDiffUtil(private val old: List, private val new: List) :
+ DiffUtil.Callback() {
+ override fun getOldListSize(): Int = old.size
+
+ override fun getNewListSize(): Int = new.size
+
+ override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+ return old[oldItemPosition].id == new[newItemPosition].id
+ }
+
+ override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+ return old[oldItemPosition] == new[newItemPosition]
+ }
+ }
}
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 909bb687..9954c642 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
@@ -90,7 +90,7 @@ class MessageTabFragment : BaseFragment(R.layout.frag
}
override fun updateData(data: List) {
- tabAdapter.replaceAll(data)
+ tabAdapter.setDataItems(data)
}
override fun updateItem(item: Message, position: Int) {
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 221762d1..533f5ac8 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
@@ -1,6 +1,5 @@
package io.github.wulkanowy.ui.modules.message.tab
-import android.annotation.SuppressLint
import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.repositories.message.MessageFolder
import io.github.wulkanowy.data.repositories.message.MessageRepository
@@ -11,8 +10,13 @@ import io.github.wulkanowy.ui.base.ErrorHandler
import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
import io.github.wulkanowy.utils.SchedulersProvider
import io.github.wulkanowy.utils.toFormattedString
+import io.reactivex.subjects.PublishSubject
+import me.xdrop.fuzzywuzzy.FuzzySearch
import timber.log.Timber
+import java.util.Locale
+import java.util.concurrent.TimeUnit
import javax.inject.Inject
+import kotlin.math.pow
class MessageTabPresenter @Inject constructor(
schedulers: SchedulersProvider,
@@ -31,9 +35,12 @@ class MessageTabPresenter @Inject constructor(
private var messages = emptyList()
+ private val searchQuery = PublishSubject.create()
+
fun onAttachView(view: MessageTabView, folder: MessageFolder) {
super.onAttachView(view)
view.initView()
+ initializeSearchStream()
errorHandler.showErrorMessage = ::showErrorViewOnError
this.folder = folder
}
@@ -76,38 +83,35 @@ class MessageTabPresenter @Inject constructor(
private fun loadData(forceRefresh: Boolean) {
Timber.i("Loading $folder message data started")
- disposable.apply {
- clear()
- add(studentRepository.getCurrentStudent()
- .flatMap { student ->
- semesterRepository.getCurrentSemester(student)
- .flatMap { messageRepository.getMessages(student, it, folder, forceRefresh) }
+ disposable.add(studentRepository.getCurrentStudent()
+ .flatMap { student ->
+ semesterRepository.getCurrentSemester(student)
+ .flatMap { messageRepository.getMessages(student, it, folder, forceRefresh) }
+ }
+ .subscribeOn(schedulers.backgroundThread)
+ .observeOn(schedulers.mainThread)
+ .doFinally {
+ view?.run {
+ showRefresh(false)
+ showProgress(false)
+ enableSwipe(true)
+ notifyParentDataLoaded()
}
- .subscribeOn(schedulers.backgroundThread)
- .observeOn(schedulers.mainThread)
- .doFinally {
- view?.run {
- showRefresh(false)
- showProgress(false)
- enableSwipe(true)
- notifyParentDataLoaded()
- }
- }
- .subscribe({
- Timber.i("Loading $folder message result: Success")
- messages = it
- onSearchQueryTextChange(lastSearchQuery)
- analytics.logEvent(
- "load_data",
- "type" to "messages",
- "items" to it.size,
- "folder" to folder.name
- )
- }) {
- Timber.i("Loading $folder message result: An exception occurred")
- errorHandler.dispatch(it)
- })
- }
+ }
+ .subscribe({
+ Timber.i("Loading $folder message result: Success")
+ messages = it
+ view?.updateData(getFilteredData(lastSearchQuery))
+ analytics.logEvent(
+ "load_data",
+ "type" to "messages",
+ "items" to it.size,
+ "folder" to folder.name
+ )
+ }) {
+ Timber.i("Loading $folder message result: An exception occurred")
+ errorHandler.dispatch(it)
+ })
}
private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -121,25 +125,36 @@ class MessageTabPresenter @Inject constructor(
}
}
- @SuppressLint("DefaultLocale")
fun onSearchQueryTextChange(query: String) {
- lastSearchQuery = query
+ if (query != searchQuery.toString())
+ searchQuery.onNext(query)
+ }
- val lowerCaseQuery = query.toLowerCase()
- val filteredList = mutableListOf()
- messages.forEach {
- if (lowerCaseQuery in it.subject.toLowerCase() ||
- lowerCaseQuery in it.sender.toLowerCase() ||
- lowerCaseQuery in it.recipient.toLowerCase() ||
- lowerCaseQuery in it.date.toFormattedString()
- ) {
- filteredList.add(it)
+ private fun initializeSearchStream() {
+ disposable.add(searchQuery
+ .debounce(250, TimeUnit.MILLISECONDS)
+ .map { query ->
+ lastSearchQuery = query
+ getFilteredData(query)
}
+ .subscribeOn(schedulers.backgroundThread)
+ .observeOn(schedulers.mainThread)
+ .subscribe({
+ Timber.d("Applying filter. Full list: ${messages.size}, filtered: ${it.size}")
+ updateData(it)
+ }) { Timber.e(it) })
+ }
+
+ private fun getFilteredData(query: String): List {
+ return if (query.trim().isEmpty()) {
+ messages.sortedByDescending { it.date }
+ } else {
+ messages
+ .map { it to calculateMatchRatio(it, query) }
+ .sortedByDescending { it.second }
+ .filter { it.second > 5000 }
+ .map { it.first }
}
-
- Timber.d("Applying filter. Full list: ${messages.size}, filtered: ${filteredList.size}")
-
- updateData(filteredList)
}
private fun updateData(data: List) {
@@ -151,4 +166,42 @@ class MessageTabPresenter @Inject constructor(
resetListPosition()
}
}
+
+ private fun calculateMatchRatio(message: Message, query: String): Int {
+ val subjectRatio = FuzzySearch.tokenSortPartialRatio(
+ query.toLowerCase(Locale.getDefault()),
+ message.subject
+ )
+
+ val senderOrRecipientRatio = FuzzySearch.tokenSortPartialRatio(
+ query.toLowerCase(Locale.getDefault()),
+ if (message.sender.isNotEmpty()) message.sender.toLowerCase(Locale.getDefault())
+ else message.recipient.toLowerCase(Locale.getDefault())
+ )
+
+ val dateRatio = listOf(
+ FuzzySearch.ratio(
+ query.toLowerCase(Locale.getDefault()),
+ message.date.toFormattedString("dd.MM").toLowerCase(Locale.getDefault())
+ ),
+ FuzzySearch.ratio(
+ query.toLowerCase(Locale.getDefault()),
+ message.date.toFormattedString("dd.MM.yyyy").toLowerCase(Locale.getDefault())
+ ),
+ FuzzySearch.ratio(
+ query.toLowerCase(Locale.getDefault()),
+ message.date.toFormattedString("d MMMM").toLowerCase(Locale.getDefault())
+ ),
+ FuzzySearch.ratio(
+ query.toLowerCase(Locale.getDefault()),
+ message.date.toFormattedString("d MMMM yyyy").toLowerCase(Locale.getDefault())
+ )
+ ).max() ?: 0
+
+
+ return (subjectRatio.toDouble().pow(2)
+ + senderOrRecipientRatio.toDouble().pow(2)
+ + dateRatio.toDouble().pow(2) * 2
+ ).toInt()
+ }
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
index 92aeb581..f72d753a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
@@ -43,7 +43,7 @@ class CompletedLessonsPresenter @Inject constructor(
completedLessonsErrorHandler.showErrorMessage = ::showErrorViewOnError
completedLessonsErrorHandler.onFeatureDisabled = {
this.view?.showFeatureDisabled()
- this.view?.showEmpty(true);
+ this.view?.showEmpty(true)
Timber.i("Completed lessons feature disabled by school")
}
loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
index 2b40cb47..cf715e65 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -71,4 +71,17 @@ fun Context.openDialer(phone: String) {
startActivity(intent)
}
+fun Context.shareText(text: String, subject: String?) {
+ val sendIntent: Intent = Intent().apply {
+ action = Intent.ACTION_SEND
+ putExtra(Intent.EXTRA_TEXT, text)
+ if (subject != null) {
+ putExtra(Intent.EXTRA_SUBJECT, subject)
+ }
+ type = "text/plain"
+ }
+ val shareIntent = Intent.createChooser(sendIntent, null)
+ startActivity(shareIntent)
+}
+
fun Context.dpToPx(dp: Float) = dp * resources.displayMetrics.densityDpi / DENSITY_DEFAULT
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
index 2c49ee97..b96faeb2 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
@@ -52,4 +52,4 @@ class LifecycleAwareVariableActivity : ReadWriteProperty Fragment.lifecycleAwareVariable() = LifecycleAwareVariable()
-fun AppCompatActivity.lifecycleAwareVariable() = LifecycleAwareVariableActivity()
+fun lifecycleAwareVariable() = LifecycleAwareVariableActivity()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
index e4d4163b..63a30db8 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
@@ -23,6 +23,8 @@ fun Sdk.init(student: Student): Sdk {
certKey = student.certificateKey
privateKey = student.privateKey
+ emptyCookieJarInterceptor = true
+
Timber.d("Sdk in ${student.loginMode} mode reinitialized")
return this
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index db9e9a9a..68045da4 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,6 +1,8 @@
-Wersja 0.18.3
-- poprawiliśmy liczenie średniej i dodaliśmy nowy sposób jej liczenia w ustawieniach
-- naprawiliśmy usuwanie wiadomości
-- naprawiliśmy wysyłanie wiadomości na Lubelskim Portalu Oświatowym
+Wersja 0.19.0
+- naprawiliśmy pokazywanie brakujących przedmiotów na liście podsumowania ocen
+- ulepszyliśmy wygląd menadżera kont
+- ulepszyliśmy wyszukiwarkę wiadomości
+- dodaliśmy powiadomienia o proponowanych i końcowych ocenach
+- dodaliśmy opcję udostępniania i drukowania wiadomości
Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
diff --git a/app/src/main/res/drawable/ic_menu_message_print.xml b/app/src/main/res/drawable/ic_menu_message_print.xml
new file mode 100644
index 00000000..204b0f6e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_print.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_menu_message_share.xml b/app/src/main/res/drawable/ic_menu_message_share.xml
new file mode 100644
index 00000000..67a8ee49
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_share.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/layout/dialog_account.xml b/app/src/main/res/layout/dialog_account.xml
index 6e975c80..d56de3a2 100644
--- a/app/src/main/res/layout/dialog_account.xml
+++ b/app/src/main/res/layout/dialog_account.xml
@@ -5,45 +5,60 @@
android:layout_width="300dp"
android:layout_height="wrap_content">
-
-
-
+ android:orientation="vertical">
-
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/header_account.xml b/app/src/main/res/layout/header_account.xml
new file mode 100644
index 00000000..6219c26d
--- /dev/null
+++ b/app/src/main/res/layout/header_account.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 614e4d2d..9568b345 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -3,20 +3,17 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:layout_height="56dp"
+ android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:orientation="horizontal"
- android:paddingStart="24dp"
- android:paddingLeft="24dp"
- android:paddingEnd="24dp"
- android:paddingRight="24dp"
+ android:paddingVertical="8dp"
+ android:paddingHorizontal="16dp"
tools:context=".ui.modules.account.AccountAdapter">
+
+
diff --git a/app/src/main/res/menu/action_menu_message_preview.xml b/app/src/main/res/menu/action_menu_message_preview.xml
index dfc12e23..4c1332e1 100644
--- a/app/src/main/res/menu/action_menu_message_preview.xml
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -22,4 +22,18 @@
android:title="@string/message_delete"
app:iconTint="@color/material_on_surface_emphasis_medium"
app:showAsAction="ifRoom" />
+ - Durchschnittsnote für das 2. Semester
- - Average of grades from both semesters
- - Durchschnitt der Bewertungen für das ganze Jahr
+ - Durchschnitt der Noten aus beiden Semestern
+ - Durchschnitt der Noten aus dem ganzen Jahr
- Nicht zeigen
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4b166937..7cc44fd9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -103,10 +103,26 @@
- Neue Note
- Neue Noten
+
+ - New predicted grade
+ - New predicted grades
+
+
+ - New final grade
+ - New final grades
+
- Du hast %1$d Note bekommen
- Du hast %1$d Noten bekommen
+
+ - You received %1$d predicted grade
+ - You received %1$d predicted grades
+
+
+ - You received %1$d final grade
+ - You received %1$d final grades
+
Lektion
Klassenzimmer
@@ -172,6 +188,8 @@
In den Korb wandern
Dauerhaft löschen
Nachricht erfolgreich gelöscht
+ Share
+ Print
Thema
Inhalt
Nachricht erfolgreich gesendet
@@ -214,7 +232,7 @@
Die heutige Glücksnummer ist
Keine Information über die Glücksnummer.
Glücksnummer für heute
- Die heutige Glücksnummer ist:
+ Die heutige Glücksnummer ist: %d
Mobile Geräte
Keine Geräte
@@ -245,6 +263,10 @@
Abmelden
Wollen Sie sich von einem aktiven Studenten abmelden?
Abmeldung von Student
+ Student account
+ Parent account
+ Mobile API mode
+ Hybrid mode
Version der App
Mitarbeiter
@@ -270,8 +292,8 @@
Logs teilen
Aktualisieren
- Check for updates
- Before reporting a bug, check first if an update with the bug fix is available
+ Auf Updates prüfen
+ Bevor Sie einen Fehler melden, prüfen Sie zuerst, ob ein Update mit der Fehlerbehebung verfügbar ist
Inhalt
Wiederhol
@@ -289,7 +311,7 @@
Zurück
Nächste
Suchen
- Suchen...
+ Suchen…
Keine Lektionen
Thema wählen
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7f25d8a6..bd4545e9 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -107,12 +107,36 @@
- Nowe oceny
- Nowe oceny
+
+ - Nowa ocena przewidywana
+ - Nowe oceny przewidywane
+ - Nowe oceny przewidywane
+ - Nowe oceny przewidywane
+
+
+ - Nowa ocena końcowa
+ - Nowe oceny końcowe
+ - Nowe oceny końcowe
+ - Nowe oceny końcowe
+
- Masz %1$d nową ocenę
- Masz %1$d nowe oceny
- Masz %1$d nowych ocen
- Masz %1$d nowych ocen
+
+ - Masz %1$d nową przewidywaną ocenę
+ - Masz %1$d nowe przewidywane oceny
+ - Masz %1$d nowych przewidywanych ocen
+ - Masz %1$d nowych przewidywanych ocen
+
+
+ - Masz %1$d nową końcową ocenę
+ - Masz %1$d nowe końcowe oceny
+ - Masz %1$d nowych końcowych ocen
+ - Masz %1$d nowych końcowych ocen
+
Lekcja
Sala
@@ -180,6 +204,8 @@
Przenieś do kosza
Usuń trwale
Wiadomość usunięta pomyślnie
+ Udostępnij
+ Drukuj
Temat
Treść
Wiadomość wysłana pomyślnie
@@ -265,6 +291,10 @@
Wyloguj
Czy chcesz wylogować aktualnego ucznia?
Wylogowanie ucznia
+ Konto ucznia
+ Konto rodzica
+ Tryb API mobilne
+ Tryb hybrydowy
Wersja aplikacji
Twórcy
@@ -309,7 +339,7 @@
Poprzedni
Następny
Szukaj
- Szukaj...
+ Szukaj…
Brak lekcji
Wybierz motyw
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index bd8bb844..a41abf35 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -37,7 +37,7 @@
- Средняя оценка со 2 семестра
- Average of grades from both semesters
- - Средняя оценка с целого года
+ - Average of grades from the whole year
- Не показывать
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6eb8f774..15c58317 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -107,12 +107,36 @@
- Новые оценки
- Новые оценки
+
+ - New predicted grade
+ - New predicted grades
+ - New predicted grades
+ - New predicted grades
+
+
+ - New final grade
+ - New final grades
+ - New final grades
+ - New final grades
+
- Вы получили %1$d оценку
- Вы получили %1$d оценки
- Вы получили %1$d оценок
- Вы получили %1$d оценок
+
+ - You received %1$d predicted grade
+ - You received %1$d predicted grades
+ - You received %1$d predicted grades
+ - You received %1$d predicted grades
+
+
+ - You received %1$d final grade
+ - You received %1$d final grades
+ - You received %1$d final grades
+ - You received %1$d final grades
+
Урок
Аудитория
@@ -180,6 +204,8 @@
Перенести в корзину
Удалить навсегда
Сообщение успешно удалено
+ Share
+ Print
Тема
Текст
Сообщение успешно отправлено
@@ -265,6 +291,10 @@
Выйти
Вы точно хотите выйти из данного аккаунта?
Выйти
+ Student account
+ Parent account
+ Mobile API mode
+ Hybrid mode
Версия приложения
Разработчики
@@ -309,7 +339,7 @@
Предыдущий
Следующий
Поиск
- Поиск...
+ Поиск…
Нет уроков
Выбрать тему
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index be2179c3..9942621a 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -37,7 +37,7 @@
- Середня оцінка з 2 семестру
- Average of grades from both semesters
- - Середня оцінка за весь рік
+ - Average of grades from the whole year
- Не показувати
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ec4dbc15..423c4e12 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -107,12 +107,36 @@
- Нові оцінки
- Нові оцінки
+
+ - New predicted grade
+ - New predicted grades
+ - New predicted grades
+ - New predicted grades
+
+
+ - New final grade
+ - New final grades
+ - New final grades
+ - New final grades
+
- Ви отримали %1$d оцінку
- Ви отримали %1$d оцінки
- Ви отримали %1$d оцінок
- Ви отримали %1$d оцінок
+
+ - You received %1$d predicted grade
+ - You received %1$d predicted grades
+ - You received %1$d predicted grades
+ - You received %1$d predicted grades
+
+
+ - You received %1$d final grade
+ - You received %1$d final grades
+ - You received %1$d final grades
+ - You received %1$d final grades
+
Урок
Аудиторія
@@ -180,6 +204,8 @@
Перемістити у кошик
Видалити назавжди
Повідомлення було успішно видалено
+ Share
+ Print
Тема
Зміст
Повідомлення було успішно відправлено
@@ -265,6 +291,10 @@
Вийти
Ви впевнені, що хочете вийти з цього аккаунту?
Вийти з аккаунту учня
+ Student account
+ Parent account
+ Mobile API mode
+ Hybrid mode
Версія додатка
Розробники
@@ -309,7 +339,7 @@
Попередній
Наступний
Пошук
- Пошук...
+ Пошук…
Брак уроків
Увібрати тему
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7793cd9c..1eaebf28 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -113,10 +113,26 @@
- New grade
- New grades
+
+ - New predicted grade
+ - New predicted grades
+
+
+ - New final grade
+ - New final grades
+
- You received %1$d grade
- You received %1$d grades
+
+ - You received %1$d predicted grade
+ - You received %1$d predicted grades
+
+
+ - You received %1$d final grade
+ - You received %1$d final grades
+
@@ -194,6 +210,8 @@
Move to trash
Delete permanently
Message deleted successfully
+ Share
+ Print
Subject
Content
Message sent successfully
@@ -282,6 +300,10 @@
Logout
Do you want to log out of an active student?
Student logout
+ Student account
+ Parent account
+ Mobile API mode
+ Hybrid mode
@@ -339,7 +361,7 @@
Prev
Next
Search
- Search...
+ Search…
diff --git a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
index 5d003f27..f7d29220 100644
--- a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
+++ b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
@@ -1,5 +1,6 @@
package io.github.wulkanowy
+import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
import io.github.wulkanowy.data.db.entities.Timetable
@@ -72,3 +73,25 @@ fun getTimetableEntity(
teacher = "",
teacherOld = ""
)
+
+fun getMessageEntity(
+ messageId: Int,
+ content: String,
+ unread: Boolean
+) = Message(
+ studentId = 1,
+ realId = 1,
+ messageId = messageId,
+ sender = "",
+ senderId = 1,
+ recipient = "",
+ subject = "",
+ content = content,
+ date = now(),
+ folderId = 1,
+ unread = unread,
+ unreadBy = 1,
+ readBy = 1,
+ removed = false,
+ hasAttachments = false
+)
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
index b7963d43..fcc4188a 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
@@ -2,10 +2,10 @@ package io.github.wulkanowy.data.repositories.message
import androidx.room.EmptyResultSetException
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.db.entities.MessageWithAttachment
import io.github.wulkanowy.data.db.entities.Student
import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
+import io.github.wulkanowy.getMessageEntity
import io.reactivex.Single
import io.reactivex.observers.TestObserver
import org.junit.Assert.assertEquals
@@ -15,7 +15,6 @@ import org.mockito.Mock
import org.mockito.Mockito.`when`
import org.mockito.Mockito.verify
import org.mockito.MockitoAnnotations
-import org.threeten.bp.LocalDateTime.now
import java.net.UnknownHostException
class MessageRepositoryTest {
@@ -44,7 +43,7 @@ class MessageRepositoryTest {
@Test
fun `throw error when message is not in the db`() {
- val testMessage = Message(1, 1, 1, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
+ val testMessage = getMessageEntity(1, "", false)
`when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.error(EmptyResultSetException("No message in database")))
val message = repo.getMessage(student, testMessage)
@@ -55,7 +54,7 @@ class MessageRepositoryTest {
@Test
fun `get message when content already in db`() {
- val testMessage = Message(1, 1, 123, "", 1, "", "", "Test", now(), 1, false, 1, 1, false, false)
+ val testMessage = getMessageEntity(123, "Test", false)
val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
`when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
@@ -67,7 +66,7 @@ class MessageRepositoryTest {
@Test
fun `get message when content in db is empty`() {
- val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
+ val testMessage = getMessageEntity(123, "", true)
val testMessageWithContent = testMessage.copy(content = "Test")
val mWa = MessageWithAttachment(testMessage, emptyList())
@@ -86,7 +85,7 @@ class MessageRepositoryTest {
@Test
fun `get message when content in db is empty and there is no internet connection`() {
- val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
+ val testMessage = getMessageEntity(123, "", false)
val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
testObservingStrategy.isInternetConnection = false
@@ -100,7 +99,7 @@ class MessageRepositoryTest {
@Test
fun `get message when content in db is empty, unread and there is no internet connection`() {
- val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
+ val testMessage = getMessageEntity(123, "", true)
val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
testObservingStrategy.isInternetConnection = false
diff --git a/build.gradle b/build.gradle
index 7e5759d1..4de7310b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
buildscript {
ext.kotlin_version = '1.3.72'
- ext.about_libraries = '8.1.6'
+ ext.about_libraries = '8.2.0'
repositories {
mavenCentral()
google()
@@ -13,7 +13,7 @@ buildscript {
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
classpath "com.github.triplet.gradle:play-publisher:2.7.5"
- classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8"
+ classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0"
classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${about_libraries}"
}
+ Wulkanowy Dzienniczek
+