sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[Messages] Implement saving list position on message open.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2020-04-05 21:40:12 +02:00
parent c214b48409
commit 0413dbffa2
8 changed files with 72 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
View File

@ -20,7 +20,6 @@ import androidx.appcompat.widget.PopupMenu
import androidx.core.graphics.ColorUtils
import androidx.lifecycle.Observer
import androidx.navigation.NavOptions
import androidx.recyclerview.widget.RecyclerView
import com.danimahardhika.cafebar.CafeBar
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.mikepenz.iconics.IconicsColor
@ -69,7 +68,6 @@ import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkFragment
import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
import pl.szczodrzynski.edziennik.ui.modules.messages.MessageFragment
import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesListFragmentOld
import pl.szczodrzynski.edziennik.ui.modules.messages.compose.MessagesComposeFragment
import pl.szczodrzynski.edziennik.ui.modules.notifications.NotificationsListFragment
import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment
@ -889,9 +887,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
}
app.profileLoad(id) {
MessagesFragment.pageSelection = -1
MessagesListFragmentOld.tapPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
MessagesListFragmentOld.topPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
MessagesListFragmentOld.bottomPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
setDrawerItems()
// the drawer profile is updated automatically when the drawer item is clicked
@ -916,9 +911,10 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
loadTarget(target, arguments)
}
}
private fun loadTarget(target: NavTarget, arguments: Bundle? = null) {
d("NavDebug", "loadTarget(target = $target, arguments = $arguments)")
private fun loadTarget(target: NavTarget, args: Bundle? = null) {
d("NavDebug", "loadTarget(target = $target, args = $args)")
val arguments = args ?: navBackStack.firstOrNull { it.first.id == target.id }?.second ?: Bundle()
bottomSheet.close()
bottomSheet.removeAllContextual()
bottomSheet.toggleGroupEnabled = false
@ -966,6 +962,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
navBackStack.removeAt(navBackStack.lastIndex)
}
navTarget = target
navArguments = arguments
return@let null
}?.let {
@ -975,7 +972,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
R.anim.task_open_enter,
R.anim.task_open_exit
)
navBackStack.add(navTarget to arguments)
navBackStack.add(navTarget to navArguments)
navTarget = target
navArguments = arguments
}

9
app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherDao.kt
View File

@ -1,10 +1,8 @@
package pl.szczodrzynski.edziennik.data.db.dao
import androidx.lifecycle.LiveData
import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import androidx.room.*
import androidx.sqlite.db.SupportSQLiteQuery
import pl.szczodrzynski.edziennik.data.db.entity.Teacher
@Dao
@ -18,6 +16,9 @@ interface TeacherDao {
@Insert(onConflict = OnConflictStrategy.IGNORE)
fun addAllIgnore(teacherList: List<Teacher>)
@RawQuery
fun query(query: SupportSQLiteQuery): Int
@Query("DELETE FROM teachers WHERE profileId = :profileId")
fun clear(profileId: Int)

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/FragmentLazyPagerAdapter.kt
View File

@ -10,7 +10,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
class FragmentLazyPagerAdapter(
fragmentManager: FragmentManager,
swipeRefreshLayout: SwipeRefreshLayout,
private val fragments: List<Pair<LazyFragment, CharSequence>>
val fragments: List<Pair<LazyFragment, CharSequence>>
) : LazyPagerAdapter(fragmentManager, swipeRefreshLayout) {
override fun getPage(position: Int) = fragments[position].first
override fun getPageTitle(position: Int) = fragments[position].second

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyFragment.kt
View File

@ -4,6 +4,7 @@
package pl.szczodrzynski.edziennik.ui.modules.base.lazypager
import android.os.Bundle
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.RecyclerView
@ -11,6 +12,7 @@ abstract class LazyFragment : Fragment() {
private var isPageCreated = false
internal var position = -1
internal var swipeRefreshLayoutCallback: ((position: Int, isEnabled: Boolean) -> Unit)? = null
internal var onPageDestroy: ((position: Int, outState: Bundle?) -> Unit?)? = null
/**
* Called when the page is first shown, or if previous

5
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabFragment.kt
View File

@ -9,6 +9,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.sqlite.db.SimpleSQLiteQuery
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
@ -55,5 +56,9 @@ class LabFragment : Fragment(), CoroutineScope {
}
}
}
b.rodo.onClick {
app.db.teacherDao().query(SimpleSQLiteQuery("UPDATE teachers SET teacherSurname = \"\" WHERE profileId = ${App.profileId}"))
}
}
}

25
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt
View File

@ -52,20 +52,34 @@ class MessagesFragment : Fragment(), CoroutineScope {
return
}
val args = arguments
val pagerAdapter = FragmentLazyPagerAdapter(
fragmentManager ?: return,
b.refreshLayout,
listOf(
MessagesListFragment().apply {
onPageDestroy = this@MessagesFragment.onPageDestroy
arguments = Bundle("messageType" to Message.TYPE_RECEIVED)
args?.getBundle("page0")?.let {
arguments?.putAll(it)
}
} to getString(R.string.messages_tab_received),
MessagesListFragment().apply {
onPageDestroy = this@MessagesFragment.onPageDestroy
arguments = Bundle("messageType" to Message.TYPE_SENT)
args?.getBundle("page1")?.let {
arguments?.putAll(it)
}
} to getString(R.string.messages_tab_sent),
MessagesListFragment().apply {
onPageDestroy = this@MessagesFragment.onPageDestroy
arguments = Bundle("messageType" to Message.TYPE_DELETED)
args?.getBundle("page2")?.let {
arguments?.putAll(it)
}
} to getString(R.string.messages_tab_deleted)
)
)
@ -93,4 +107,15 @@ class MessagesFragment : Fragment(), CoroutineScope {
activity.gainAttentionFAB()
}
private val onPageDestroy = { position: Int, outState: Bundle? ->
arguments?.putBundle("page$position", outState)
}
override fun onDestroy() {
super.onDestroy()
(b.viewPager.adapter as? FragmentLazyPagerAdapter)?.fragments?.forEach {
it.first.onDestroy()
}
}
}

22
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.kt
View File

@ -11,6 +11,7 @@ import android.view.ViewGroup
import androidx.core.view.isVisible
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView.NO_POSITION
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
@ -50,6 +51,8 @@ class MessagesListFragment : LazyFragment(), CoroutineScope {
override fun onPageCreated(): Boolean { startCoroutineTimer(100L) {
val messageType = arguments.getInt("messageType", Message.TYPE_RECEIVED)
var topPosition = arguments.getInt("topPosition", NO_POSITION)
var bottomPosition = arguments.getInt("bottomPosition", NO_POSITION)
teachers = withContext(Dispatchers.Default) {
app.db.teacherDao().getAllNow(App.profileId)
@ -87,6 +90,16 @@ class MessagesListFragment : LazyFragment(), CoroutineScope {
adapter.notifyDataSetChanged()
setSwipeToRefresh(messageType in Message.TYPE_RECEIVED..Message.TYPE_SENT && items.isNullOrEmpty())
(b.list.layoutManager as? LinearLayoutManager)?.let { layoutManager ->
if (topPosition != NO_POSITION && topPosition > layoutManager.findLastCompletelyVisibleItemPosition()) {
b.list.scrollToPosition(topPosition)
} else if (bottomPosition != NO_POSITION && bottomPosition < layoutManager.findFirstCompletelyVisibleItemPosition()) {
b.list.scrollToPosition(bottomPosition)
}
topPosition = NO_POSITION
bottomPosition = NO_POSITION
}
// show/hide relevant views
b.progressBar.isVisible = false
if (items.isNullOrEmpty()) {
@ -98,4 +111,13 @@ class MessagesListFragment : LazyFragment(), CoroutineScope {
}
})
}; return true }
override fun onDestroy() {
super.onDestroy()
if (!isAdded) return
onPageDestroy?.invoke(position, Bundle(
"topPosition" to (b.list.layoutManager as? LinearLayoutManager)?.findFirstCompletelyVisibleItemPosition(),
"bottomPosition" to (b.list.layoutManager as? LinearLayoutManager)?.findLastCompletelyVisibleItemPosition()
))
}
}

7
app/src/main/res/layout/lab_fragment.xml
View File

@ -40,6 +40,13 @@
android:layout_height="wrap_content"
android:text="Set last 10 as unseen"
android:textAllCaps="false" />
<Button
android:id="@+id/rodo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Duh rodo button"
android:textAllCaps="false" />
</LinearLayout>
</ScrollView>
</layout>