forked from github/szkolny
Compare commits
No commits in common. "b148f7197fdca2ab81d457ab5c70dc1901f102a7" and "ab3af676638a21e874c6e8d68167f329bf60b270" have entirely different histories.
b148f7197f
...
ab3af67663
@ -1,6 +1,5 @@
|
|||||||
package pl.szczodrzynski.edziennik
|
package pl.szczodrzynski.edziennik
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.app.ActivityManager
|
import android.app.ActivityManager
|
||||||
import android.content.BroadcastReceiver
|
import android.content.BroadcastReceiver
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
@ -1212,9 +1211,9 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
|
|||||||
drawer.addProfileSettings(*drawerProfiles.toTypedArray())
|
drawer.addProfileSettings(*drawerProfiles.toTypedArray())
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressLint("MissingSuperCall")
|
|
||||||
@Deprecated("Deprecated in Java")
|
@Deprecated("Deprecated in Java")
|
||||||
override fun onBackPressed() {
|
override fun onBackPressed() {
|
||||||
|
super.onBackPressed()
|
||||||
if (App.config.ui.openDrawerOnBackPressed) {
|
if (App.config.ui.openDrawerOnBackPressed) {
|
||||||
if (drawer.isOpen)
|
if (drawer.isOpen)
|
||||||
navigateUp()
|
navigateUp()
|
||||||
|
@ -391,7 +391,7 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
|
|||||||
fun apiGetList(
|
fun apiGetList(
|
||||||
tag: String,
|
tag: String,
|
||||||
endpoint: String,
|
endpoint: String,
|
||||||
filterType: HebeFilterType? = null,
|
filterType: HebeFilterType = HebeFilterType.BY_PUPIL,
|
||||||
dateFrom: Date? = null,
|
dateFrom: Date? = null,
|
||||||
dateTo: Date? = null,
|
dateTo: Date? = null,
|
||||||
lastSync: Long? = null,
|
lastSync: Long? = null,
|
||||||
@ -424,7 +424,6 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
|
|||||||
HebeFilterType.BY_MESSAGEBOX -> {
|
HebeFilterType.BY_MESSAGEBOX -> {
|
||||||
query["box"] = messageBox ?: data.messageBoxKey ?: ""
|
query["box"] = messageBox ?: data.messageBoxKey ?: ""
|
||||||
}
|
}
|
||||||
else -> {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dateFrom != null)
|
if (dateFrom != null)
|
||||||
|
@ -47,7 +47,9 @@ class SettingsAboutCard(util: SettingsUtil) : SettingsCard(util), CoroutineScope
|
|||||||
items = ::getItems,
|
items = ::getItems,
|
||||||
itemsMore = ::getItemsMore,
|
itemsMore = ::getItemsMore,
|
||||||
backgroundColor = R.attr.colorPrimaryContainer.resolveAttr(activity)
|
backgroundColor = R.attr.colorPrimaryContainer.resolveAttr(activity)
|
||||||
)
|
).also {
|
||||||
|
it.items.addAll(getItems(it))
|
||||||
|
}
|
||||||
|
|
||||||
private val versionDetailsItem by lazy {
|
private val versionDetailsItem by lazy {
|
||||||
util.createActionItem(
|
util.createActionItem(
|
||||||
|
Loading…
Reference in New Issue
Block a user