diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b1f24f9b..1b63b60c 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -143,6 +143,7 @@
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
       <option name="PARAMETER_ANNOTATION_WRAP" value="2" />
       <option name="ENUM_CONSTANTS_WRAP" value="2" />
     </codeStyleSettings>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3f5cd18b..8f6aabd4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -126,7 +126,7 @@
               / ____ \ (__| |_| |\ V /| | |_| |  __/\__ \
              /_/    \_\___|\__|_| \_/ |_|\__|_|\___||___/
         -->
-        <activity android:name=".ui.base.CrashActivity"
+        <activity android:name=".ui.main.CrashActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:process=":error_activity"
             android:exported="false"
@@ -163,8 +163,7 @@
             android:configChanges="orientation|keyboardHidden"
             android:exported="false"
             android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar" />
-        <activity android:name=".ui.base.BuildInvalidActivity" android:exported="false" />
-        <activity android:name=".ui.settings.contributors.ContributorsActivity" android:exported="false" />
+        <activity android:name=".ui.main.BuildInvalidActivity" android:exported="false" />
 
         <!--  _____               _
              |  __ \             (_)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
index f760e1af..7a72d8eb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
@@ -54,7 +54,7 @@ import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.enums.LoginType
 import pl.szczodrzynski.edziennik.network.SSLProviderInstaller
-import pl.szczodrzynski.edziennik.ui.base.CrashActivity
+import pl.szczodrzynski.edziennik.ui.main.CrashActivity
 import pl.szczodrzynski.edziennik.utils.PermissionChecker
 import pl.szczodrzynski.edziennik.utils.Utils
 import timber.log.Timber
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
index 250bdda1..19c15889 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -19,6 +19,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import androidx.core.view.isVisible
 import androidx.navigation.NavOptions
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.danimahardhika.cafebar.CafeBar
 import com.danimahardhika.cafebar.CafeBarTheme
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -49,7 +50,7 @@ import pl.szczodrzynski.edziennik.core.work.AppManagerDetectedEvent
 import pl.szczodrzynski.edziennik.core.work.SyncWorker
 import pl.szczodrzynski.edziennik.core.work.UpdateStateEvent
 import pl.szczodrzynski.edziennik.core.work.UpdateWorker
-import pl.szczodrzynski.edziennik.ui.base.MainSnackbar
+import pl.szczodrzynski.edziennik.ui.main.MainSnackbar
 import pl.szczodrzynski.edziennik.data.enums.NavTarget
 import pl.szczodrzynski.edziennik.data.enums.NavTargetLocation
 import pl.szczodrzynski.edziennik.ui.dialogs.ChangelogDialog
@@ -59,8 +60,8 @@ import pl.szczodrzynski.edziennik.ui.dialogs.sync.ServerMessageDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.sync.SyncViewListDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.sync.UpdateAvailableDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.sync.UpdateProgressDialog
-import pl.szczodrzynski.edziennik.ui.error.ErrorDetailsDialog
-import pl.szczodrzynski.edziennik.ui.error.ErrorSnackbar
+import pl.szczodrzynski.edziennik.ui.dialogs.ErrorDetailsDialog
+import pl.szczodrzynski.edziennik.ui.main.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
 import pl.szczodrzynski.edziennik.ui.login.LoginActivity
 import pl.szczodrzynski.edziennik.ui.messages.list.MessagesFragment
@@ -76,7 +77,6 @@ import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
 import pl.szczodrzynski.navlib.drawer.NavDrawer
 import pl.szczodrzynski.navlib.drawer.items.DrawerPrimaryItem
 import timber.log.Timber
-import java.io.IOException
 import kotlin.coroutines.CoroutineContext
 import kotlin.math.roundToInt
 
@@ -97,7 +97,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     val errorSnackbar: ErrorSnackbar by lazy { ErrorSnackbar(this) }
     val requestHandler by lazy { MainActivityRequestHandler(this) }
 
-    val swipeRefreshLayout: SwipeRefreshLayoutNoTouch by lazy { b.swipeRefreshLayout }
+    val swipeRefreshLayout: SwipeRefreshLayout by lazy { b.swipeRefreshLayout }
 
     var onBeforeNavigate: (() -> Boolean)? = null
     private var pausedNavigationData: PausedNavigationData? = null
@@ -264,9 +264,8 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             drawer.setUnreadCounterList(unreadCounters)
         }
 
-        b.swipeRefreshLayout.isEnabled = true
-        b.swipeRefreshLayout.setOnRefreshListener { launch { syncCurrentFeature() } }
-        b.swipeRefreshLayout.setColorSchemeResources(
+        swipeRefreshLayout.setOnRefreshListener { launch { syncCurrentFeature() } }
+        swipeRefreshLayout.setColorSchemeResources(
             R.color.md_blue_500,
             R.color.md_amber_500,
             R.color.md_green_500
@@ -939,6 +938,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         val arguments = args
             ?: navBackStack.firstOrNull { it.first == navTarget }?.second
             ?: Bundle()
+        swipeRefreshLayout.isEnabled = false
         bottomSheet.close()
         bottomSheet.removeAllContextual()
         bottomSheet.toggleGroupEnabled = false
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/BuildManager.kt b/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/BuildManager.kt
index a60abe68..8eaec5d8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/BuildManager.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/BuildManager.kt
@@ -34,7 +34,7 @@ import pl.szczodrzynski.edziennik.ext.md5
 import pl.szczodrzynski.edziennik.ext.resolveAttr
 import pl.szczodrzynski.edziennik.ext.resolveColor
 import pl.szczodrzynski.edziennik.ext.toJsonObject
-import pl.szczodrzynski.edziennik.ui.base.BuildInvalidActivity
+import pl.szczodrzynski.edziennik.ui.main.BuildInvalidActivity
 import pl.szczodrzynski.edziennik.utils.Utils
 import timber.log.Timber
 import java.time.Instant
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/FirebaseManager.kt b/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/FirebaseManager.kt
index ba3dbe6a..bebfe6a1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/FirebaseManager.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/core/manager/FirebaseManager.kt
@@ -69,6 +69,14 @@ class FirebaseManager(val app: App) {
     )
 
     fun initializeApps() {
+        try {
+            // skip Firebase setup if the default app is not initialized
+            // (e.g. in the crash process)
+            FirebaseApp.getInstance()
+        } catch (e: IllegalStateException) {
+            return
+        }
+
         FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { result ->
             val token = result.token
             Timber.i("Got App token: $token")
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
index 954d6bb1..dab3e908 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
@@ -28,8 +28,8 @@ import pl.szczodrzynski.edziennik.ext.keys
 import pl.szczodrzynski.edziennik.ext.md5
 import pl.szczodrzynski.edziennik.ext.toApiError
 import pl.szczodrzynski.edziennik.ext.toErrorCode
-import pl.szczodrzynski.edziennik.ui.error.ErrorDetailsDialog
-import pl.szczodrzynski.edziennik.ui.error.ErrorSnackbar
+import pl.szczodrzynski.edziennik.ui.dialogs.ErrorDetailsDialog
+import pl.szczodrzynski.edziennik.ui.main.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.login.LoginInfo
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/enums/NavTarget.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/enums/NavTarget.kt
index e981e3bd..34356f96 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/enums/NavTarget.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/enums/NavTarget.kt
@@ -30,7 +30,9 @@ import pl.szczodrzynski.edziennik.ui.notes.NotesFragment
 import pl.szczodrzynski.edziennik.ui.notifications.NotificationsListFragment
 import pl.szczodrzynski.edziennik.ui.settings.ProfileManagerFragment
 import pl.szczodrzynski.edziennik.ui.settings.SettingsFragment
+import pl.szczodrzynski.edziennik.ui.settings.contributors.ContributorsFragment
 import pl.szczodrzynski.edziennik.ui.teachers.TeachersListFragment
+import pl.szczodrzynski.edziennik.ui.template.TemplateFragment
 import pl.szczodrzynski.edziennik.ui.timetable.TimetableFragment
 import pl.szczodrzynski.edziennik.ui.webpush.WebPushFragment
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
@@ -177,6 +179,15 @@ enum class NavTarget(
         popTo = HOME,
         devModeOnly = true,
     ),
+    TEMPLATE(
+        id = 1001,
+        fragmentClass = TemplateFragment::class.java,
+        location = NavTargetLocation.DRAWER_BOTTOM,
+        nameRes = R.string.menu_template,
+        icon = CommunityMaterial.Icon.cmd_code_braces,
+        popTo = HOME,
+        devModeOnly = true,
+    ),
     PROFILE_ADD(
         id = 200,
         fragmentClass = null,
@@ -243,6 +254,11 @@ enum class NavTarget(
         id = 140,
         fragmentClass = WebPushFragment::class.java,
         nameRes = R.string.menu_web_push,
+    ),
+    CONTRIBUTORS(
+        id = 150,
+        fragmentClass = ContributorsFragment::class.java,
+        nameRes = R.string.contributors,
     );
 
     companion object {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ext/BundleExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ext/BundleExtensions.kt
index 1f16877f..0e1ee3c7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ext/BundleExtensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ext/BundleExtensions.kt
@@ -31,34 +31,33 @@ fun Bundle?.getIntOrNull(key: String): Int? {
 }
 
 @Suppress("UNCHECKED_CAST")
-fun <T : Any> Bundle?.get(key: String): T? {
-    return this?.get(key) as? T?
+operator fun Bundle.set(key: String, value: Any) = when (value) {
+    is String -> putString(key, value as String?)
+    is Char -> putChar(key, value)
+    is Int -> putInt(key, value)
+    is Long -> putLong(key, value)
+    is Float -> putFloat(key, value)
+    is Short -> putShort(key, value)
+    is Double -> putDouble(key, value)
+    is Boolean -> putBoolean(key, value)
+    is Bundle -> putBundle(key, value)
+    is Enum<*> -> putEnum(key, value)
+    is Array<*> -> putParcelableArray(key, value as Array<out Parcelable>)
+    is Parcelable -> putParcelable(key, value)
+    is Serializable -> putSerializable(key, value)
+    else -> throw IllegalArgumentException("Couldn't serialize $key = $value")
 }
 
-@Suppress("UNCHECKED_CAST")
-fun Bundle(vararg properties: Pair<String, Any?>): Bundle {
-    return Bundle().apply {
-        for (property in properties) {
-            val (key, value) = property
-            when (value) {
-                is String -> putString(key, value as String?)
-                is Char -> putChar(key, value)
-                is Int -> putInt(key, value)
-                is Long -> putLong(key, value)
-                is Float -> putFloat(key, value)
-                is Short -> putShort(key, value)
-                is Double -> putDouble(key, value)
-                is Boolean -> putBoolean(key, value)
-                is Bundle -> putBundle(key, value)
-                is Enum<*> -> putEnum(key, value)
-                is Array<*> -> putParcelableArray(key, value as Array<out Parcelable>)
-                is Parcelable -> putParcelable(key, value)
-                is Serializable -> putSerializable(key, value)
-            }
-        }
+fun Bundle.putExtras(vararg properties: Pair<String, Any?>): Bundle {
+    for (property in properties) {
+        val (key, value) = property
+        this[key] = value ?: continue
     }
+    return this
 }
 
+fun Bundle(vararg properties: Pair<String, Any?>) = Bundle().putExtras(*properties)
+
 fun Intent(action: String? = null, vararg properties: Pair<String, Any?>): Intent {
     return Intent(action).putExtras(Bundle(*properties))
 }
@@ -68,7 +67,7 @@ fun Intent(packageContext: Context, cls: Class<*>, vararg properties: Pair<Strin
 }
 
 fun Intent.putExtras(vararg properties: Pair<String, Any?>) = putExtras(Bundle(*properties))
-fun Bundle.putExtras(vararg properties: Pair<String, Any?>) = putAll(Bundle(*properties))
+
 
 fun Bundle.toJsonObject(): JsonObject {
     val json = JsonObject()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ext/ContextExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ext/ContextExtensions.kt
index 56f1fe63..4793c9d0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ext/ContextExtensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ext/ContextExtensions.kt
@@ -7,10 +7,11 @@ package pl.szczodrzynski.edziennik.ext
 import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.getSystemService
 import pl.szczodrzynski.edziennik.App
 
-val Context.app
+val AppCompatActivity.app
     get() = applicationContext as App
 
 val Context.isNightMode: Boolean
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ext/GraphicsExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ext/GraphicsExtensions.kt
index b2c0b957..7377053a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ext/GraphicsExtensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ext/GraphicsExtensions.kt
@@ -61,6 +61,12 @@ fun @receiver:AttrRes Int.resolveAttr(context: Context?): Int {
     }
     return typedValue.data
 }
+@StyleRes
+fun @receiver:AttrRes Int.resolveStyleAttr(context: Context?): Int {
+    val typedValue = TypedValue()
+    context?.theme?.resolveAttribute(this, typedValue, true)
+    return typedValue.data
+}
 @Dimension
 fun @receiver:AttrRes Int.resolveDimenAttr(context: Context): Float {
     val typedValue = TypedValue()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ext/ViewExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ext/ViewExtensions.kt
index ddf49975..62367c2f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ext/ViewExtensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ext/ViewExtensions.kt
@@ -13,7 +13,6 @@ import android.view.WindowManager
 import android.widget.*
 import androidx.annotation.StringRes
 import androidx.recyclerview.widget.RecyclerView
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import androidx.viewpager.widget.ViewPager
 import com.google.android.material.button.MaterialButton
 
@@ -152,16 +151,6 @@ inline fun ViewPager.addOnPageSelectedListener(crossinline block: (position: Int
     override fun onPageSelected(position: Int) { block(position) }
 })
 
-val SwipeRefreshLayout.onScrollListener: RecyclerView.OnScrollListener
-    get() = object : RecyclerView.OnScrollListener() {
-        override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-            if (recyclerView.canScrollVertically(-1))
-                this@onScrollListener.isEnabled = false
-            if (!recyclerView.canScrollVertically(-1) && newState == RecyclerView.SCROLL_STATE_IDLE)
-                this@onScrollListener.isEnabled = true
-        }
-    }
-
 fun View.removeFromParent() {
     (parent as? ViewGroup)?.removeView(this)
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/AgendaFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/AgendaFragment.kt
index 6b17727f..4c03ebef 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/AgendaFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/AgendaFragment.kt
@@ -8,135 +8,103 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.databinding.ViewDataBinding
-import androidx.fragment.app.Fragment
 import com.applandeo.materialcalendarview.EventDay
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import com.mikepenz.iconics.utils.colorInt
 import com.mikepenz.iconics.utils.sizeDp
 import eu.szkolny.font.SzkolnyFont
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.db.entity.EventType
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.enums.MetadataType
 import pl.szczodrzynski.edziennik.databinding.FragmentAgendaCalendarBinding
 import pl.szczodrzynski.edziennik.databinding.FragmentAgendaDefaultBinding
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.AgendaConfigDialog
 import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
-import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
-import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
-import kotlin.coroutines.CoroutineContext
 
-class AgendaFragment : Fragment(), CoroutineScope {
+class AgendaFragment : BaseFragment<ViewDataBinding, MainActivity>(
+    inflater = null,
+) {
 
-    private lateinit var activity: MainActivity
-    private lateinit var b: ViewDataBinding
+    override fun inflate(
+        inflater: LayoutInflater,
+        parent: ViewGroup?,
+        attachToParent: Boolean,
+    ) = when (app.profile.config.ui.agendaViewType) {
+        Profile.AGENDA_DEFAULT -> FragmentAgendaDefaultBinding.inflate(inflater, parent, false)
+        Profile.AGENDA_CALENDAR -> FragmentAgendaCalendarBinding.inflate(inflater, parent, false)
+        else -> null
+    }
 
-    private val app by lazy { activity.app }
-
-    private var job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    private var type: Int = Profile.AGENDA_DEFAULT
+    override fun getFab() = R.string.add to CommunityMaterial.Icon3.cmd_plus
+    override fun getMarkAsReadType() = MetadataType.EVENT
+    override fun getBottomSheetItems() = listOf(
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_add_event)
+            .withDescription(R.string.menu_add_event_desc)
+            .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                EventManualDialog(
+                    activity,
+                    app.profileId,
+                    defaultDate = AgendaFragmentDefault.selectedDate
+                ).show()
+            },
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_agenda_config)
+            .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                AgendaConfigDialog(activity, true, null, null).show()
+            },
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_agenda_change_view)
+            .withIcon(
+                if (app.profile.config.ui.agendaViewType == Profile.AGENDA_DEFAULT)
+                    CommunityMaterial.Icon.cmd_calendar_outline
+                else
+                    CommunityMaterial.Icon2.cmd_format_list_bulleted_square
+            )
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                app.profile.config.ui.agendaViewType =
+                    if (app.profile.config.ui.agendaViewType == Profile.AGENDA_DEFAULT)
+                        Profile.AGENDA_CALENDAR
+                    else
+                        Profile.AGENDA_DEFAULT
+                activity.reloadTarget()
+            },
+    )
 
     private var agendaDefault: AgendaFragmentDefault? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        if (getActivity() == null || context == null) return null
-        activity = getActivity() as MainActivity
-        type = app.profile.config.ui.agendaViewType
-        b = when (type) {
-            Profile.AGENDA_DEFAULT -> FragmentAgendaDefaultBinding.inflate(inflater, container, false)
-            Profile.AGENDA_CALENDAR -> FragmentAgendaCalendarBinding.inflate(inflater, container, false)
-            else -> return null
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
+        when (app.profile.config.ui.agendaViewType) {
+            Profile.AGENDA_DEFAULT -> createDefaultAgendaView(
+                b as? FragmentAgendaDefaultBinding ?: return
+            )
+            Profile.AGENDA_CALENDAR -> createCalendarAgendaView(
+                b as? FragmentAgendaCalendarBinding ?: return
+            )
         }
-        return b.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!isAdded) return
-
-        activity.bottomSheet.prependItems(
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_add_event)
-                        .withDescription(R.string.menu_add_event_desc)
-                        .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline)
-                        .withOnClickListener {
-                            activity.bottomSheet.close()
-                            EventManualDialog(
-                                activity,
-                                app.profileId,
-                                defaultDate = AgendaFragmentDefault.selectedDate
-                            ).show()
-                        },
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_agenda_config)
-                        .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
-                        .withOnClickListener {
-                            activity.bottomSheet.close()
-                            AgendaConfigDialog(activity, true, null, null).show()
-                        },
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_agenda_change_view)
-                        .withIcon(if (type == Profile.AGENDA_DEFAULT) CommunityMaterial.Icon.cmd_calendar_outline else CommunityMaterial.Icon2.cmd_format_list_bulleted_square)
-                        .withOnClickListener {
-                            activity.bottomSheet.close()
-                            type =
-                                if (type == Profile.AGENDA_DEFAULT) Profile.AGENDA_CALENDAR else Profile.AGENDA_DEFAULT
-                            app.profile.config.ui.agendaViewType = type
-                            activity.reloadTarget()
-                        },
-                BottomSheetSeparatorItem(true),
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_mark_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
-                        .withOnClickListener {
-                            launch {
-                                activity.bottomSheet.close()
-                                withContext(Dispatchers.Default) {
-                                    App.db.metadataDao()
-                                        .setAllSeen(app.profileId, MetadataType.EVENT, true)
-                                }
-                                Toast.makeText(
-                                    activity,
-                                    R.string.main_menu_mark_as_read_success,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        }
-        )
-
-        activity.navView.bottomBar.fabEnable = true
-        activity.navView.bottomBar.fabExtendedText = getString(R.string.add)
-        activity.navView.bottomBar.fabIcon = CommunityMaterial.Icon3.cmd_plus
-        activity.navView.setFabOnClickListener {
-            EventManualDialog(
-                activity,
-                app.profileId,
-                defaultDate = AgendaFragmentDefault.selectedDate
-            ).show()
-        }
-
-        activity.gainAttention()
-        activity.gainAttentionFAB()
-
-        when (type) {
-            Profile.AGENDA_DEFAULT -> createDefaultAgendaView()
-            Profile.AGENDA_CALENDAR -> createCalendarAgendaView()
-        }
+    override suspend fun onFabClick() {
+        EventManualDialog(
+            activity,
+            app.profileId,
+            defaultDate = AgendaFragmentDefault.selectedDate
+        ).show()
     }
 
     private suspend fun checkEventTypes() {
@@ -145,23 +113,25 @@ class AgendaFragment : Fragment(), CoroutineScope {
         }
     }
 
-    private fun createDefaultAgendaView() { (b as? FragmentAgendaDefaultBinding)?.let { b -> launch {
+    private suspend fun createDefaultAgendaView(b: FragmentAgendaDefaultBinding) {
         if (!isAdded)
-            return@launch
+            return
         checkEventTypes()
         delay(500)
 
         agendaDefault = AgendaFragmentDefault(activity, app, b)
         agendaDefault?.initView(this@AgendaFragment)
-    }}}
+    }
 
-    private fun createCalendarAgendaView() { (b as? FragmentAgendaCalendarBinding)?.let { b -> launch {
+    private suspend fun createCalendarAgendaView(b: FragmentAgendaCalendarBinding) {
         checkEventTypes()
         delay(300)
 
         val dayList = mutableListOf<EventDay>()
 
-        val events = withContext(Dispatchers.Default) { app.db.eventDao().getAllNow(app.profileId) }
+        val events = withContext(Dispatchers.IO) {
+            app.db.eventDao().getAllNow(app.profileId)
+        }
         val unreadEventDates = mutableSetOf<Int>()
 
         events.forEach { event ->
@@ -189,5 +159,5 @@ class AgendaFragment : Fragment(), CoroutineScope {
         }}
 
         b.progressBar.visibility = View.GONE
-    }}}
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/DayDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/DayDialog.kt
index 4d239003..c1e666c1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/DayDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/DayDialog.kt
@@ -22,7 +22,7 @@ import pl.szczodrzynski.edziennik.ui.agenda.lessonchanges.LessonChangesEventRend
 import pl.szczodrzynski.edziennik.ui.agenda.teacherabsence.TeacherAbsenceDialog
 import pl.szczodrzynski.edziennik.ui.agenda.teacherabsence.TeacherAbsenceEvent
 import pl.szczodrzynski.edziennik.ui.agenda.teacherabsence.TeacherAbsenceEventRenderer
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.ui.event.EventDetailsDialog
 import pl.szczodrzynski.edziennik.ui.event.EventListAdapter
 import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesDialog.kt
index 50e972a6..3b05177d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesDialog.kt
@@ -7,7 +7,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.DialogLessonChangeListBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.ui.timetable.LessonDetailsDialog
 import pl.szczodrzynski.edziennik.utils.models.Date
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceDialog.kt
index 7a1071de..df8c71dd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceDialog.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.LinearLayoutManager
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.DialogTeacherAbsenceListBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class TeacherAbsenceDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/announcements/AnnouncementsFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/announcements/AnnouncementsFragment.java
index e1baae81..cccede9c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/announcements/AnnouncementsFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/announcements/AnnouncementsFragment.java
@@ -51,7 +51,6 @@ public class AnnouncementsFragment extends Fragment {
         app = (App) activity.getApplication();
         // activity, context and profile is valid
         b = DataBindingUtil.inflate(inflater, R.layout.fragment_announcements, container, false);
-        b.refreshLayout.setParent(activity.getSwipeRefreshLayout());
         return b.getRoot();
     }
 
@@ -77,10 +76,6 @@ public class AnnouncementsFragment extends Fragment {
                         })
         );
 
-        /*b.refreshLayout.setOnRefreshListener(() -> {
-            activity.syncCurrentFeature(MainActivity.DRAWER_ITEM_ANNOUNCEMENTS, b.refreshLayout);
-        });*/
-
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
 
         //RecyclerViewExpandableItemManager expMgr = new RecyclerViewExpandableItemManager(null);
@@ -90,18 +85,6 @@ public class AnnouncementsFragment extends Fragment {
         recyclerView.setLayoutManager(linearLayoutManager);
         recyclerView.addItemDecoration(new SimpleDividerItemDecoration(view.getContext()));
 
-        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-                if (recyclerView.canScrollVertically(-1)) {
-                    b.refreshLayout.setEnabled(false);
-                }
-                if (!recyclerView.canScrollVertically(-1) && newState == SCROLL_STATE_IDLE) {
-                    b.refreshLayout.setEnabled(true);
-                }
-            }
-        });
-
         app.getDb().announcementDao().getAll(App.Companion.getProfileId()).observe(getViewLifecycleOwner(), announcements -> {
             if (app == null || activity == null || b == null || !isAdded())
                 return;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceDetailsDialog.kt
index 7ab4901a..6f551ede 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceDetailsDialog.kt
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
 import pl.szczodrzynski.edziennik.databinding.AttendanceDetailsDialogBinding
 import pl.szczodrzynski.edziennik.ext.setTintColor
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.ui.notes.setupNotesButton
 import pl.szczodrzynski.edziennik.utils.BetterLink
 import pl.szczodrzynski.edziennik.core.manager.NoteManager
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceFragment.kt
index cdcb5552..ce0429af 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceFragment.kt
@@ -4,118 +4,59 @@
 
 package pl.szczodrzynski.edziennik.ui.attendance
 
-import android.os.AsyncTask
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.enums.MetadataType
-import pl.szczodrzynski.edziennik.databinding.AttendanceFragmentBinding
+import pl.szczodrzynski.edziennik.databinding.BasePagerFragmentBinding
 import pl.szczodrzynski.edziennik.ext.Bundle
-import pl.szczodrzynski.edziennik.ext.addOnPageSelectedListener
-import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
+import pl.szczodrzynski.edziennik.ui.base.fragment.PagerFragment
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.AttendanceConfigDialog
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
-import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
-import kotlin.coroutines.CoroutineContext
 
-class AttendanceFragment : Fragment(), CoroutineScope {
+class AttendanceFragment : PagerFragment<BasePagerFragmentBinding, MainActivity>(
+    inflater = BasePagerFragmentBinding::inflate,
+) {
     companion object {
-        private const val TAG = "AttendanceFragment"
         const val VIEW_SUMMARY = 0
         const val VIEW_DAYS = 1
         const val VIEW_MONTHS = 2
         const val VIEW_TYPES = 3
         const val VIEW_LIST = 4
-        var pageSelection = 1
     }
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: AttendanceFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = AttendanceFragmentBinding.inflate(inflater)
-        b.refreshLayout.setParent(activity.swipeRefreshLayout)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!isAdded) return
-
-        activity.bottomSheet.prependItems(
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_attendance_config)
-                        .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
-                        .withOnClickListener(View.OnClickListener {
-                            activity.bottomSheet.close()
-                            AttendanceConfigDialog(activity, true, null, null).show()
-                        }),
-                BottomSheetSeparatorItem(true),
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_mark_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
-                        .withOnClickListener(View.OnClickListener {
-                            activity.bottomSheet.close()
-                            AsyncTask.execute { App.db.metadataDao().setAllSeen(App.profileId, MetadataType.ATTENDANCE, true) }
-                            Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show()
-                        })
-        )
-        activity.gainAttention()
-
-        if (pageSelection == 1)
-            pageSelection = app.profile.config.attendance.attendancePageSelection
-
-        val pagerAdapter = FragmentLazyPagerAdapter(
-            parentFragmentManager,
-                b.refreshLayout,
-                listOf(
-                        AttendanceSummaryFragment() to getString(R.string.attendance_tab_summary),
-
-                        AttendanceListFragment().apply {
-                            arguments = Bundle("viewType" to VIEW_DAYS)
-                        } to getString(R.string.attendance_tab_days),
-
-                        AttendanceListFragment().apply {
-                            arguments = Bundle("viewType" to VIEW_MONTHS)
-                        } to getString(R.string.attendance_tab_months),
-
-                        AttendanceListFragment().apply {
-                            arguments = Bundle("viewType" to VIEW_TYPES)
-                        } to getString(R.string.attendance_tab_types),
-
-                        AttendanceListFragment().apply {
-                            arguments = Bundle("viewType" to VIEW_LIST)
-                        } to getString(R.string.attendance_tab_list)
-                )
-        )
-        b.viewPager.apply {
-            offscreenPageLimit = 1
-            adapter = pagerAdapter
-            currentItem = pageSelection
-            addOnPageSelectedListener {
-                pageSelection = it
-                app.profile.config.attendance.attendancePageSelection = it
-            }
-            b.tabLayout.setupWithViewPager(this)
+    override var savedPageSelection
+        get() = app.profile.config.attendance.attendancePageSelection
+        set(value) {
+            app.profile.config.attendance.attendancePageSelection = value
         }
-    }
+
+    override fun getMarkAsReadType() = MetadataType.ATTENDANCE
+    override fun getBottomSheetItems() = listOf(
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_attendance_config)
+            .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                AttendanceConfigDialog(activity, true, null, null).show()
+            },
+    )
+
+    override fun getTabLayout() = b.tabLayout
+    override fun getViewPager() = b.viewPager
+    override suspend fun onCreatePages() = listOf(
+        AttendanceSummaryFragment() to getString(R.string.attendance_tab_summary),
+        AttendanceListFragment().apply {
+            arguments = Bundle("viewType" to VIEW_DAYS)
+        } to getString(R.string.attendance_tab_days),
+        AttendanceListFragment().apply {
+            arguments = Bundle("viewType" to VIEW_MONTHS)
+        } to getString(R.string.attendance_tab_months),
+        AttendanceListFragment().apply {
+            arguments = Bundle("viewType" to VIEW_TYPES)
+        } to getString(R.string.attendance_tab_types),
+        AttendanceListFragment().apply {
+            arguments = Bundle("viewType" to VIEW_LIST)
+        } to getString(R.string.attendance_tab_list)
+    )
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceListFragment.kt
index 02eae698..444e6288 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceListFragment.kt
@@ -5,13 +5,12 @@
 package pl.szczodrzynski.edziennik.ui.attendance
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
@@ -22,41 +21,20 @@ import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
 import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceDayRange
 import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceMonth
 import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceTypeGroup
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.grades.models.GradesSubject
 import pl.szczodrzynski.edziennik.utils.models.Date
-import kotlin.coroutines.CoroutineContext
 
-class AttendanceListFragment : LazyFragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "AttendanceListFragment"
-    }
+class AttendanceListFragment : BaseFragment<AttendanceListFragmentBinding, MainActivity>(
+    inflater = AttendanceListFragmentBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: AttendanceListFragmentBinding
+    override fun getRefreshScrollingView() = b.list
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-    private val manager
-        get() = app.attendanceManager
     private var viewType = AttendanceFragment.VIEW_DAYS
     private var expandSubjectId = 0L
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = AttendanceListFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onPageCreated(): Boolean { startCoroutineTimer(100L) {
-        if (!isAdded) return@startCoroutineTimer
-
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         viewType = arguments?.getInt("viewType") ?: AttendanceFragment.VIEW_DAYS
         expandSubjectId = arguments?.getLong("gradesSubjectId") ?: 0L
 
@@ -77,11 +55,9 @@ class AttendanceListFragment : LazyFragment(), CoroutineScope {
                 b.list.apply {
                     setHasFixedSize(true)
                     layoutManager = LinearLayoutManager(context)
-                    addOnScrollListener(onScrollListener)
                 }
             }
             adapter.notifyDataSetChanged()
-            setSwipeToRefresh(adapter.items.isNullOrEmpty())
 
             if (firstRun) {
                 expandSubject(adapter)
@@ -90,7 +66,7 @@ class AttendanceListFragment : LazyFragment(), CoroutineScope {
 
             // show/hide relevant views
             b.progressBar.isVisible = false
-            if (adapter.items.isNullOrEmpty()) {
+            if (adapter.items.isEmpty()) {
                 b.list.isVisible = false
                 b.noData.isVisible = true
             } else {
@@ -102,7 +78,7 @@ class AttendanceListFragment : LazyFragment(), CoroutineScope {
         adapter.onAttendanceClick = {
             AttendanceDetailsDialog(activity, it).show()
         }
-    }; return true}
+    }
 
     private fun expandSubject(adapter: AttendanceAdapter) {
         var expandSubjectModel: GradesSubject? = null
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceSummaryFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceSummaryFragment.kt
index 828e5a95..60e93d5d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceSummaryFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceSummaryFragment.kt
@@ -6,9 +6,6 @@ package pl.szczodrzynski.edziennik.ui.attendance
 
 import android.graphics.Color
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.view.animation.Animation
 import android.view.animation.Transformation
@@ -19,8 +16,12 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.coroutines.*
-import pl.szczodrzynski.edziennik.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
 import pl.szczodrzynski.edziennik.databinding.AttendanceSummaryFragmentBinding
@@ -30,43 +31,26 @@ import pl.szczodrzynski.edziennik.ext.setText
 import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
 import pl.szczodrzynski.edziennik.ui.attendance.AttendanceFragment.Companion.VIEW_SUMMARY
 import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceSubject
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.grades.models.GradesSubject
 import pl.szczodrzynski.edziennik.utils.models.Date
 import java.text.DecimalFormat
-import kotlin.coroutines.CoroutineContext
 
-class AttendanceSummaryFragment : LazyFragment(), CoroutineScope {
+class AttendanceSummaryFragment : BaseFragment<AttendanceSummaryFragmentBinding, MainActivity>(
+    inflater = AttendanceSummaryFragmentBinding::inflate,
+) {
     companion object {
-        private const val TAG = "AttendanceSummaryFragment"
         private var periodSelection = 0
     }
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: AttendanceSummaryFragmentBinding
+    override fun getRefreshScrollingView() = b.list
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
     private val manager
         get() = app.attendanceManager
     private var expandSubjectId = 0L
     private var attendance = listOf<AttendanceFull>()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = AttendanceSummaryFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onPageCreated(): Boolean { startCoroutineTimer(100L) {
-        if (!isAdded) return@startCoroutineTimer
-
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         expandSubjectId = arguments?.getLong("gradesSubjectId") ?: 0L
 
         val adapter = AttendanceAdapter(activity, VIEW_SUMMARY)
@@ -91,7 +75,6 @@ class AttendanceSummaryFragment : LazyFragment(), CoroutineScope {
                 }
             }
             adapter.notifyDataSetChanged()
-            setSwipeToRefresh(adapter.items.isNullOrEmpty())
 
             if (firstRun) {
                 expandSubject(adapter)
@@ -100,7 +83,7 @@ class AttendanceSummaryFragment : LazyFragment(), CoroutineScope {
 
             // show/hide relevant views
             b.progressBar.isVisible = false
-            if (adapter.items.isNullOrEmpty()) {
+            if (adapter.items.isEmpty()) {
                 b.statsLayout.isVisible = false
                 b.list.isVisible = false
                 b.noData.isVisible = true
@@ -144,7 +127,7 @@ class AttendanceSummaryFragment : LazyFragment(), CoroutineScope {
                 adapter.notifyDataSetChanged()
             }
         }
-    }; return true}
+    }
 
     private fun expandSubject(adapter: AttendanceAdapter) {
         var expandSubjectModel: GradesSubject? = null
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/BaseDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/BaseDialog.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/BaseDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/BaseDialog.kt
index bfdd1687..69a9a0f3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/BaseDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/BaseDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-10-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.base
+package pl.szczodrzynski.edziennik.ui.base.dialog
 
 import android.view.View
 import androidx.appcompat.app.AlertDialog
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/BindingDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/BindingDialog.kt
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/BindingDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/BindingDialog.kt
index 782ac129..d07823a3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/BindingDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/BindingDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-10-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.base
+package pl.szczodrzynski.edziennik.ui.base.dialog
 
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/ConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/ConfigDialog.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/ConfigDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/ConfigDialog.kt
index 13e14a3b..0c938c2e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/ConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/ConfigDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-10-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.base
+package pl.szczodrzynski.edziennik.ui.base.dialog
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/ViewDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/ViewDialog.kt
similarity index 92%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/ViewDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/ViewDialog.kt
index 20d81b95..775d8f00 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/base/ViewDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/dialog/ViewDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-10-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.base
+package pl.szczodrzynski.edziennik.ui.base.dialog
 
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/fragment/ActivityUtil.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/fragment/ActivityUtil.kt
new file mode 100644
index 00000000..4f3aa776
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/fragment/ActivityUtil.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2024-7-3.
+ */
+
+package pl.szczodrzynski.edziennik.ui.base.fragment
+
+import android.annotation.SuppressLint
+import android.view.MotionEvent
+import android.view.View
+import android.widget.Toast
+import androidx.recyclerview.widget.RecyclerView
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.ui.login.LoginActivity
+import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
+import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
+
+@SuppressLint("ClickableViewAccessibility")
+internal fun BaseFragment<*, *>.setupCanRefresh() {
+    when (val view = getRefreshScrollingView()) {
+        is RecyclerView -> {
+            canRefresh = !view.canScrollVertically(-1)
+            view.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                    // disable refresh when scrolled down
+                    if (recyclerView.canScrollVertically(-1))
+                        canRefresh = false
+                    // enable refresh when scrolled to the top and not scrolling anymore
+                    else if (newState == RecyclerView.SCROLL_STATE_IDLE)
+                        canRefresh = true
+                }
+            })
+        }
+
+        is View -> {
+            canRefresh = !view.canScrollVertically(-1)
+            var isTouched = false
+            view.setOnTouchListener { _, event ->
+                // keep track of the touch state
+                when (event.action) {
+                    MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> isTouched = false
+                    MotionEvent.ACTION_DOWN -> isTouched = true
+                }
+                // disable refresh when scrolled down
+                if (view.canScrollVertically(-1))
+                    canRefresh = false
+                // enable refresh when scrolled to the top and not touching anymore
+                else if (!isTouched)
+                    canRefresh = true
+                false
+            }
+        }
+
+        else -> {
+            // dispatch the default value to the activity
+            canRefresh = canRefresh
+        }
+    }
+}
+
+internal fun BaseFragment<*, *>.setupMainActivity(activity: MainActivity) {
+    val items = getBottomSheetItems().toMutableList()
+    getMarkAsReadType()?.let { metadataType ->
+        if (items.isNotEmpty())
+            items += BottomSheetSeparatorItem(true)
+        items += BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_mark_as_read)
+            .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                launch(Dispatchers.IO) {
+                    app.db.metadataDao().setAllSeen(app.profileId, metadataType, true)
+                }
+                Toast.makeText(
+                    activity,
+                    R.string.main_menu_mark_as_read_success,
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+    }
+    if (items.isNotEmpty()) {
+        activity.navView.bottomSheet.prependItems(*items.toTypedArray())
+    }
+
+    getFab()?.let { (text, icon) ->
+        activity.navView.bottomBar.apply {
+            fabEnable = true
+            fabExtendedText = app.getString(text)
+            fabIcon = icon
+            setFabOnClickListener {
+                launch {
+                    onFabClick()
+                }
+            }
+        }
+    }
+}
+
+internal fun BaseFragment<*, *>.setupLoginActivity(activity: LoginActivity) {}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/fragment/BaseFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/fragment/BaseFragment.kt
new file mode 100644
index 00000000..4a5c7b30
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/fragment/BaseFragment.kt
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2024-7-2.
+ */
+
+package pl.szczodrzynski.edziennik.ui.base.fragment
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
+import com.mikepenz.iconics.typeface.IIcon
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.data.enums.MetadataType
+import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
+import pl.szczodrzynski.edziennik.ui.login.LoginActivity
+import pl.szczodrzynski.navlib.bottomsheet.items.IBottomSheetItem
+import kotlin.coroutines.CoroutineContext
+
+@Suppress("UNCHECKED_CAST")
+abstract class BaseFragment<B : ViewBinding, A : AppCompatActivity>(
+    private val inflater: ((inflater: LayoutInflater, parent: ViewGroup?, attachToParent: Boolean) -> B)?,
+) : Fragment(), CoroutineScope {
+
+    internal lateinit var app: App
+    internal lateinit var activity: A
+    internal lateinit var b: B
+
+    private var isViewReady: Boolean = false
+    private var inState: Bundle? = null
+
+    /**
+     * Enables or disables the activity's SwipeRefreshLayout.
+     * Use only if [getRefreshScrollingView] is not used.
+     *
+     * The [PagerFragment] manages its [canRefresh] state
+     * based on the value of the currently selected page.
+     */
+    internal var canRefresh = false
+        set(value) {
+            field = value
+            (activity as? MainActivity)?.swipeRefreshLayout?.isEnabled =
+                !canRefreshDisabled && value
+        }
+
+    /**
+     * Forcefully disables the activity's SwipeRefreshLayout
+     * if [getRefreshScrollingView] is used.
+     */
+    internal var canRefreshDisabled = false
+        set(value) {
+            field = value
+            canRefresh = canRefresh
+        }
+
+    private var job = Job()
+    final override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    final override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        job.cancel()
+        job = Job()
+        activity = getActivity() as? A ?: return null
+        context ?: return null
+        app = activity.application as App
+        // inflate using the constructor parameter or the body method
+        b = this.inflater?.invoke(inflater, container, false)
+            ?: inflate(inflater, container, false)
+            ?: return null
+        isViewReady = false // reinitialize the view in onResume()
+        inState = savedInstanceState // save the instance state for onResume()
+        return b.root
+    }
+
+    override fun onResume() {
+        super.onResume()
+        try {
+            EventBus.getDefault().register(this)
+        } catch (_: Exception) {
+        }
+
+        if (!isAdded || isViewReady)
+            return
+        isViewReady = true
+        setupCanRefresh()
+        (activity as? MainActivity)?.let(::setupMainActivity)
+        (activity as? LoginActivity)?.let(::setupLoginActivity)
+        // let the UI transition for a moment
+        startCoroutineTimer(100L) {
+            if (!isAdded)
+                return@startCoroutineTimer
+            onViewReady(inState)
+            (activity as? MainActivity)?.gainAttention()
+            (activity as? MainActivity)?.gainAttentionFAB()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        try {
+            EventBus.getDefault().unregister(this)
+        } catch (_: Exception) {
+        }
+    }
+
+    final override fun onDestroyView() {
+        super.onDestroyView()
+        isViewReady = false
+        job.cancel()
+    }
+
+    final override fun onViewCreated(view: View, savedInstanceState: Bundle?) =
+        super.onViewCreated(view, savedInstanceState)
+
+    final override fun onViewStateRestored(savedInstanceState: Bundle?) =
+        super.onViewStateRestored(savedInstanceState)
+
+    final override fun onAttach(context: Context) = super.onAttach(context)
+    final override fun onCreate(savedInstanceState: Bundle?) = super.onCreate(savedInstanceState)
+    final override fun onStart() = super.onStart()
+    final override fun onStop() = super.onStop()
+    final override fun onDestroy() = super.onDestroy()
+    final override fun onDetach() = super.onDetach()
+
+    /**
+     * Called if there is no inflater passed in the constructor.
+     * Must return a non-null value.
+     */
+    open fun inflate(
+        inflater: LayoutInflater,
+        parent: ViewGroup?,
+        attachToParent: Boolean,
+    ): B? = null
+
+    /**
+     * Called to retrieve the scrolling view contained in the fragment.
+     * The scrolling view is configured to act nicely with the SwipeRefreshLayout.
+     */
+    open fun getRefreshScrollingView(): View? = null
+
+    /**
+     * Called to retrieve the FAB label resource and the icon.
+     * If provided, a FAB is added and shown automatically.
+     */
+    open fun getFab(): Pair<Int, IIcon>? = null
+
+    /**
+     * Called to retrieve the [MetadataType] of items displayed by the fragment.
+     * If provided, a "mark as read" item is added to the bottom sheet.
+     */
+    open fun getMarkAsReadType(): MetadataType? = null
+
+    /**
+     * Called to retrieve any extra bottom sheet items that should be displayed.
+     */
+    open fun getBottomSheetItems() = listOf<IBottomSheetItem<*>>()
+
+    /**
+     * Called after the fragment is initialized (default) or when is becomes visible (pager).
+     *
+     * Perform view initialization and other tasks, if necessary. Remember to call super
+     * if used in a [PagerFragment].
+     */
+    open suspend fun onViewReady(savedInstanceState: Bundle?) {}
+
+    /**
+     * Called when the FAB is clicked (if enabled).
+     */
+    open suspend fun onFabClick() {}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/fragment/PagerFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/fragment/PagerFragment.kt
new file mode 100644
index 00000000..83d64e8f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/fragment/PagerFragment.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2024-7-3.
+ */
+
+package pl.szczodrzynski.edziennik.ui.base.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
+import kotlinx.coroutines.launch
+import pl.szczodrzynski.edziennik.ext.set
+
+abstract class PagerFragment<B : ViewBinding, A : AppCompatActivity>(
+    inflater: ((inflater: LayoutInflater, parent: ViewGroup?, attachToParent: Boolean) -> B)?,
+) : BaseFragment<B, A>(inflater) {
+
+    private lateinit var pages: List<Pair<Fragment, String>>
+    private val fragmentCache = mutableMapOf<Int, Fragment>()
+
+    /**
+     * Stores the default page index that is activated when
+     * entering the fragment. Updated every time a new page
+     * is selected.
+     *
+     * Override with a getter and setter to make it backed by
+     * e.g. app.config. Set this value before calling super.[onViewReady]
+     * to provide a one-time default.
+     */
+    protected open var savedPageSelection = -1
+
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
+        if (savedPageSelection == -1)
+            savedPageSelection = savedInstanceState?.getInt("pageSelection") ?: 0
+
+        pages = onCreatePages()
+
+        val adapter = object : FragmentStateAdapter(this) {
+            override fun getItemCount() = getPageCount()
+            override fun createFragment(position: Int): Fragment {
+                val fragment = getPageFragment(position)
+                fragmentCache[position] = fragment
+                return fragment
+            }
+        }
+
+        getViewPager().let {
+            it.offscreenPageLimit = 1
+            it.adapter = adapter
+            it.setCurrentItem(savedPageSelection, false)
+            it.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+                override fun onPageScrollStateChanged(state: Int) {
+                    canRefresh = when (state) {
+                        ViewPager2.SCROLL_STATE_IDLE -> {
+                            val fragment =
+                                fragmentCache[it.currentItem] as? BaseFragment<*, *>
+                            fragment != null && !fragment.canRefreshDisabled && fragment.canRefresh
+                        }
+
+                        else -> false
+                    }
+                }
+
+                override fun onPageSelected(position: Int) {
+                    savedPageSelection = position
+                    launch {
+                        this@PagerFragment.onPageSelected(position)
+                    }
+                }
+            })
+        }
+
+        TabLayoutMediator(getTabLayout(), getViewPager()) { tab, position ->
+            tab.text = getPageTitle(position)
+        }.attach()
+
+        onPageSelected(savedPageSelection)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState["pageSelection"] = getViewPager().currentItem
+    }
+
+    /**
+     * Navigates to the specified page with a smooth scroll animation.
+     *
+     * To navigate without smooth scroll, use [savedPageSelection] instead
+     * to provide a default page selection.
+     */
+    protected fun goToPage(position: Int) {
+        getViewPager().setCurrentItem(position, true)
+        savedPageSelection = position
+        launch {
+            onPageSelected(position)
+        }
+    }
+
+    /**
+     * Called to retrieve the [TabLayout] view of the pager fragment.
+     */
+    abstract fun getTabLayout(): TabLayout
+
+    /**
+     * Called to retrieve the [ViewPager2] view of the pager fragment.
+     */
+    abstract fun getViewPager(): ViewPager2
+
+    /**
+     * Called to retrieve a list of fragments (and their titles) for the pager.
+     * Only used with the default implementation of [getPageCount], [getPageFragment]
+     * and [getPageTitle].
+     */
+    open suspend fun onCreatePages() = listOf<Pair<Fragment, String>>()
+
+    open fun getPageCount() = pages.size
+    open fun getPageFragment(position: Int) = pages[position].first
+    open fun getPageTitle(position: Int) = pages[position].second
+
+    /**
+     * Called when a new page is selected, by either:
+     * - opening the fragment for the first time (default page),
+     * - calling [goToPage], or
+     * - navigating to another page by the user.
+     *
+     * The [savedPageSelection] is updated before this method is called.
+     */
+    open suspend fun onPageSelected(position: Int) {}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/FragmentLazyPagerAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/FragmentLazyPagerAdapter.kt
deleted file mode 100644
index 91159270..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/FragmentLazyPagerAdapter.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-3-30.
- */
-
-package pl.szczodrzynski.edziennik.ui.base.lazypager
-
-import androidx.fragment.app.FragmentManager
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-
-class FragmentLazyPagerAdapter(
-        fragmentManager: FragmentManager,
-        swipeRefreshLayout: SwipeRefreshLayout? = null,
-        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
-    override fun getCount() = fragments.size
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyFragment.kt
deleted file mode 100644
index dd00436a..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyFragment.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-3-29.
- */
-
-package pl.szczodrzynski.edziennik.ui.base.lazypager
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.RecyclerView
-
-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
-     * [onPageCreated] returned false
-     *
-     * @return true if the view is set up
-     * @return false if the setup failed. The method may be then called
-     * again, when page becomes visible.
-     */
-    abstract fun onPageCreated(): Boolean
-
-    fun enableSwipeToRefresh() = swipeRefreshLayoutCallback?.invoke(position, true)
-    fun disableSwipeToRefresh() = swipeRefreshLayoutCallback?.invoke(position, false)
-    fun setSwipeToRefresh(enabled: Boolean) = swipeRefreshLayoutCallback?.invoke(position, enabled)
-
-    val onScrollListener: RecyclerView.OnScrollListener
-        get() = object : RecyclerView.OnScrollListener() {
-            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                if (recyclerView.canScrollVertically(-1))
-                    disableSwipeToRefresh()
-                if (!recyclerView.canScrollVertically(-1) && newState == RecyclerView.SCROLL_STATE_IDLE)
-                    enableSwipeToRefresh()
-            }
-        }
-
-    internal fun createPage() {
-        if (!isPageCreated && isAdded) {
-            isPageCreated = onPageCreated()
-        }
-    }
-
-    override fun onDestroyView() {
-        isPageCreated = false
-        super.onDestroyView()
-    }
-
-    override fun onResume() {
-        createPage()
-        super.onResume()
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyPagerAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyPagerAdapter.kt
deleted file mode 100644
index 383d0c6f..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyPagerAdapter.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-3-29.
- */
-
-package pl.szczodrzynski.edziennik.ui.base.lazypager
-
-import android.util.SparseBooleanArray
-import androidx.core.util.set
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentStatePagerAdapter
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-
-abstract class LazyPagerAdapter(fragmentManager: FragmentManager, val swipeRefreshLayout: SwipeRefreshLayout? = null) : FragmentStatePagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
-    internal val enabledList = SparseBooleanArray()
-    private val refreshLayoutCallback: (position: Int, isEnabled: Boolean) -> Unit = { position, isEnabled ->
-        swipeRefreshLayout?.isEnabled = isEnabled
-        if (position > -1)
-            enabledList[position] = isEnabled
-    }
-    final override fun getItem(position: Int): LazyFragment {
-        return getPage(position).also {
-            it.position = position
-            it.swipeRefreshLayoutCallback = refreshLayoutCallback
-        }
-    }
-    abstract fun getPage(position: Int): LazyFragment
-    abstract override fun getPageTitle(position: Int): CharSequence
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyViewPager.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyViewPager.kt
deleted file mode 100644
index 2026d974..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyViewPager.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-3-29.
- */
-
-package pl.szczodrzynski.edziennik.ui.base.lazypager
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.viewpager.widget.ViewPager
-
-class LazyViewPager @JvmOverloads constructor(
-        context: Context, attrs: AttributeSet? = null
-) : ViewPager(context, attrs) {
-
-    private var pageSelection = -1
-    private var scrollState = 0
-
-    init {
-        addOnPageChangeListener(object : OnPageChangeListener {
-            override fun onPageScrollStateChanged(state: Int) {
-                scrollState = state
-                (adapter as? LazyPagerAdapter)?.let {
-                    it.swipeRefreshLayout?.isEnabled = state == SCROLL_STATE_IDLE && it.enabledList[pageSelection, true]
-                }
-            }
-
-            override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
-
-            }
-
-            override fun onPageSelected(position: Int) {
-                pageSelection = position
-                (adapter as? LazyPagerAdapter)?.let {
-                    it.swipeRefreshLayout?.isEnabled = scrollState == SCROLL_STATE_IDLE && it.enabledList[pageSelection, true]
-                    val fragment = adapter?.instantiateItem(this@LazyViewPager, position)
-                    val lazyFragment = fragment as? LazyFragment
-                    lazyFragment?.createPage()
-                }
-            }
-        })
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/AttachmentAdapter.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/AttachmentAdapter.kt
index b7cbf698..87816516 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/AttachmentAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-1.
  */
 
-package pl.szczodrzynski.edziennik.ui.views
+package pl.szczodrzynski.edziennik.ui.base.views
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -29,9 +29,9 @@ import pl.szczodrzynski.navlib.colorAttr
 import kotlin.coroutines.CoroutineContext
 
 class AttachmentAdapter(
-        val context: Context,
-        val onAttachmentClick: (item: Item) -> Unit,
-        val onAttachmentLongClick: ((view: Chip, item: Item) -> Unit)? = null
+    val context: Context,
+    val onAttachmentClick: (item: Item) -> Unit,
+    val onAttachmentLongClick: ((view: Chip, item: Item) -> Unit)? = null
 ) : RecyclerView.Adapter<AttachmentAdapter.ViewHolder>(), CoroutineScope {
     companion object {
         private const val TAG = "AttachmentAdapter"
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentsView.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/AttachmentsView.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentsView.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/AttachmentsView.kt
index 03f52b12..aaf3d1f2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentsView.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/AttachmentsView.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-1.
  */
 
-package pl.szczodrzynski.edziennik.ui.views
+package pl.szczodrzynski.edziennik.ui.base.views
 
 import android.content.Context
 import android.os.Build
@@ -19,7 +19,6 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
-import pl.szczodrzynski.edziennik.ext.get
 import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import pl.szczodrzynski.edziennik.utils.Utils
@@ -46,7 +45,7 @@ class AttachmentsView @JvmOverloads constructor(
         val activity = context as? AppCompatActivity ?: return
         val list = this as? RecyclerView ?: return
 
-        val profileId = arguments.get<Int>("profileId") ?: return
+        val profileId = arguments.getInt("profileId")
         val attachmentIds = arguments.getLongArray("attachmentIds") ?: return
         val attachmentNames = arguments.getStringArray("attachmentNames") ?: return
         val attachmentSizes = arguments.getLongArray("attachmentSizes")
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/DateDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/DateDropdown.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/views/DateDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/DateDropdown.kt
index 69ccb26a..308d7b57 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/DateDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/DateDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.views
+package pl.szczodrzynski.edziennik.ui.base.views
 
 import android.content.Context
 import android.content.ContextWrapper
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/EventTypeDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/EventTypeDropdown.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/views/EventTypeDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/EventTypeDropdown.kt
index 48d327fc..41bbad74 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/EventTypeDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/EventTypeDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-14.
  */
 
-package pl.szczodrzynski.edziennik.ui.views
+package pl.szczodrzynski.edziennik.ui.base.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/IconicsMaterialButton.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/IconicsMaterialButton.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/views/IconicsMaterialButton.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/IconicsMaterialButton.kt
index 857e6fc0..cbc0583f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/IconicsMaterialButton.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/IconicsMaterialButton.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2024-6-20.
  */
 
-package pl.szczodrzynski.edziennik.ui.views
+package pl.szczodrzynski.edziennik.ui.base.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/SubjectDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/SubjectDropdown.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/views/SubjectDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/SubjectDropdown.kt
index cc2f0f83..b2efdddc 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/SubjectDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/SubjectDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.views
+package pl.szczodrzynski.edziennik.ui.base.views
 
 import android.content.Context
 import android.content.ContextWrapper
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeacherDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/TeacherDropdown.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeacherDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/TeacherDropdown.kt
index c67011a2..333f7685 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeacherDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/TeacherDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.views
+package pl.szczodrzynski.edziennik.ui.base.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeamDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/TeamDropdown.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeamDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/TeamDropdown.kt
index 2a395d14..93b1ba97 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeamDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/TeamDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-7.
  */
 
-package pl.szczodrzynski.edziennik.ui.views
+package pl.szczodrzynski.edziennik.ui.base.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TimeDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/TimeDropdown.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TimeDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/TimeDropdown.kt
index 51a22d88..65700756 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TimeDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/views/TimeDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.views
+package pl.szczodrzynski.edziennik.ui.base.views
 
 import android.content.Context
 import android.content.ContextWrapper
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.kt
index 992338f0..f0cf80e2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.kt
@@ -1,63 +1,32 @@
 package pl.szczodrzynski.edziennik.ui.behaviour
 
 import android.graphics.Color
-import android.os.AsyncTask
 import android.os.Bundle
-import android.view.*
-import android.widget.Toast
-import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
+import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.App.Companion.profileId
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Notice
-import pl.szczodrzynski.edziennik.data.enums.MetadataType
 import pl.szczodrzynski.edziennik.data.db.full.NoticeFull
+import pl.szczodrzynski.edziennik.data.enums.MetadataType
 import pl.szczodrzynski.edziennik.databinding.FragmentBehaviourBinding
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.utils.Themes.getPrimaryTextColor
-import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
-import java.util.*
+import java.util.Locale
 
-class BehaviourFragment : Fragment() {
+class BehaviourFragment : BaseFragment<FragmentBehaviourBinding, MainActivity>(
+    inflater = FragmentBehaviourBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: FragmentBehaviourBinding
+    override fun getMarkAsReadType() = MetadataType.NOTICE
     
     private var displayMode = MODE_YEAR
     private var noticeList: List<NoticeFull>? = null
-    
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = DataBindingUtil.inflate(inflater, R.layout.fragment_behaviour, container, false)
-        b.refreshLayout.setParent(activity.swipeRefreshLayout)
-        return b.root
-    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (app == null || activity == null || b == null || !isAdded) return
-        activity.bottomSheet.prependItems(
-            BottomSheetPrimaryItem(true)
-                .withTitle(R.string.menu_mark_as_read)
-                .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
-                .withOnClickListener { v3: View? ->
-                    activity.bottomSheet.close()
-                    AsyncTask.execute {
-                        App.db.metadataDao().setAllSeen(profileId, MetadataType.NOTICE, true)
-                    }
-                    Toast.makeText(
-                        activity,
-                        R.string.main_menu_mark_as_read_success,
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-        )
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         b.toggleGroup.check(when (displayMode) {
             0 -> R.id.allYear
             1 -> R.id.semester1
@@ -81,18 +50,8 @@ class BehaviourFragment : Fragment() {
         val linearLayoutManager = LinearLayoutManager(context)
         b.noticesView.setHasFixedSize(true)
         b.noticesView.layoutManager = linearLayoutManager
-        b.noticesView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                if (recyclerView.canScrollVertically(-1)) {
-                    b.refreshLayout.isEnabled = false
-                }
-                if (!recyclerView.canScrollVertically(-1) && newState == RecyclerView.SCROLL_STATE_IDLE) {
-                    b.refreshLayout.isEnabled = true
-                }
-            }
-        })
         App.db.noticeDao().getAll(profileId).observe(viewLifecycleOwner) { notices: List<NoticeFull>? ->
-            if (app == null || activity == null || b == null || !isAdded) return@observe
+            if (!isAdded) return@observe
             if (notices == null) {
                 b.noticesView.visibility = View.GONE
                 b.noticesNoData.visibility = View.VISIBLE
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/RecaptchaDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/RecaptchaDialog.kt
index 56d3976a..15d7d1a3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/RecaptchaDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/RecaptchaDialog.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.*
 import okhttp3.*
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.RecaptchaDialogBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import java.io.IOException
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/RecaptchaPromptDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/RecaptchaPromptDialog.kt
index ca876ddb..325a89c1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/RecaptchaPromptDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/RecaptchaPromptDialog.kt
@@ -11,7 +11,7 @@ import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.RecaptchaViewBinding
 import pl.szczodrzynski.edziennik.ext.onClick
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 
 class RecaptchaPromptDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabFragment.kt
index 06e8876e..8648eefd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabFragment.kt
@@ -4,73 +4,20 @@
 
 package pl.szczodrzynski.edziennik.ui.debug
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.databinding.TemplateFragmentBinding
-import pl.szczodrzynski.edziennik.ext.addOnPageSelectedListener
-import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
-import pl.szczodrzynski.edziennik.ui.login.LoginActivity
-import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch
-import kotlin.coroutines.CoroutineContext
+import pl.szczodrzynski.edziennik.databinding.BasePagerFragmentBinding
+import pl.szczodrzynski.edziennik.ui.base.fragment.PagerFragment
 
-class LabFragment : Fragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "LabFragment"
-        var pageSelection = 0
-    }
+class LabFragment : PagerFragment<BasePagerFragmentBinding, AppCompatActivity>(
+    inflater = BasePagerFragmentBinding::inflate,
+), CoroutineScope {
 
-    private lateinit var app: App
-    private lateinit var activity: AppCompatActivity
-    private lateinit var b: TemplateFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as AppCompatActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = TemplateFragmentBinding.inflate(inflater)
-        when (activity) {
-            is MainActivity -> b.refreshLayout.setParent((activity as MainActivity).swipeRefreshLayout)
-            is LoginActivity -> b.refreshLayout.setParent((activity as LoginActivity).swipeRefreshLayout)
-        }
-        b.refreshLayout.isEnabled = false
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!isAdded) return
-
-        val pagerAdapter = FragmentLazyPagerAdapter(
-            parentFragmentManager,
-                b.refreshLayout,
-                listOf(
-                        LabPageFragment() to "click me",
-                        LabProfileFragment() to "JSON",
-                        LabPlaygroundFragment() to "Playground",
-                )
-        )
-        b.viewPager.apply {
-            offscreenPageLimit = 1
-            adapter = pagerAdapter
-            currentItem = pageSelection
-            addOnPageSelectedListener {
-                pageSelection = it
-            }
-            b.tabLayout.setupWithViewPager(this)
-        }
-    }
+    override fun getTabLayout() = b.tabLayout
+    override fun getViewPager() = b.viewPager
+    override suspend fun onCreatePages() = listOf(
+        LabPageFragment() to "click me",
+        LabProfileFragment() to "JSON",
+        LabPlaygroundFragment() to "Playground",
+    )
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabPageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabPageFragment.kt
index 909c9eed..eb72020f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabPageFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabPageFragment.kt
@@ -6,9 +6,6 @@ package pl.szczodrzynski.edziennik.ui.debug
 
 import android.os.Bundle
 import android.os.Process
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.core.widget.doAfterTextChanged
@@ -16,47 +13,38 @@ import androidx.sqlite.db.SimpleSQLiteQuery
 import com.chuckerteam.chucker.api.Chucker
 import com.chuckerteam.chucker.api.Chucker.SCREEN_HTTP
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.config.Config
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.SignatureInterceptor
+import pl.szczodrzynski.edziennik.data.config.Config
 import pl.szczodrzynski.edziennik.data.db.entity.EventType.Companion.SOURCE_DEFAULT
 import pl.szczodrzynski.edziennik.databinding.LabFragmentBinding
-import pl.szczodrzynski.edziennik.ext.*
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ext.asBoldSpannable
+import pl.szczodrzynski.edziennik.ext.asColoredSpannable
+import pl.szczodrzynski.edziennik.ext.asItalicSpannable
+import pl.szczodrzynski.edziennik.ext.asUnderlineSpannable
+import pl.szczodrzynski.edziennik.ext.concat
+import pl.szczodrzynski.edziennik.ext.onChange
+import pl.szczodrzynski.edziennik.ext.onClick
+import pl.szczodrzynski.edziennik.ext.resolveAttr
+import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
+import pl.szczodrzynski.edziennik.ext.takeValue
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.dialogs.ProfileRemoveDialog
 import pl.szczodrzynski.edziennik.utils.TextInputDropDown
 import pl.szczodrzynski.fslogin.decode
-import kotlin.coroutines.CoroutineContext
 import kotlin.system.exitProcess
 
-class LabPageFragment : LazyFragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "LabPageFragment"
-    }
+class LabPageFragment : BaseFragment<LabFragmentBinding, AppCompatActivity>(
+    inflater = LabFragmentBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: AppCompatActivity
-    private lateinit var b: LabFragmentBinding
+    override fun getRefreshScrollingView() = b.scrollView
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as AppCompatActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = LabFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onPageCreated(): Boolean {
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         b.app = app
 
         if (app.profile.id == 0) {
@@ -222,7 +210,5 @@ class LabPageFragment : LazyFragment(), CoroutineScope {
                 }.concat("\n\n")
             b.cookies.text = text
         }
-
-        return true
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabPlaygroundFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabPlaygroundFragment.kt
index 4b4beb52..56e1573f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabPlaygroundFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabPlaygroundFragment.kt
@@ -5,51 +5,21 @@
 package pl.szczodrzynski.edziennik.ui.debug
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.databinding.LabPlaygroundBinding
 import pl.szczodrzynski.edziennik.ext.asColoredSpannable
 import pl.szczodrzynski.edziennik.ext.concat
 import pl.szczodrzynski.edziennik.ext.resolveAttr
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import timber.log.Timber
-import kotlin.coroutines.CoroutineContext
 
-class LabPlaygroundFragment : LazyFragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "LabPlaygroundFragment"
-    }
+class LabPlaygroundFragment : BaseFragment<LabPlaygroundBinding, AppCompatActivity>(
+    inflater = LabPlaygroundBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: AppCompatActivity
-    private lateinit var b: LabPlaygroundBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? {
-        activity = (getActivity() as AppCompatActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = LabPlaygroundBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onPageCreated(): Boolean {
+    override fun getRefreshScrollingView() = b.root
 
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         Timber.d("textColorSecondary: ${android.R.attr.textColorSecondary.resolveAttr(activity)}")
         b.spanTest1.text = listOf(
             "Text:", "android:textColorSecondary spannable (activity)".asColoredSpannable(
@@ -62,7 +32,5 @@ class LabPlaygroundFragment : LazyFragment(), CoroutineScope {
                 android.R.attr.textColorSecondary.resolveAttr(context)
             )
         ).concat(" ")
-
-        return true
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabProfileFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabProfileFragment.kt
index fd22392b..fb421313 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabProfileFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabProfileFragment.kt
@@ -5,9 +5,6 @@
 package pl.szczodrzynski.edziennik.ui.debug
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -16,48 +13,30 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import com.google.gson.JsonPrimitive
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.databinding.TemplateListPageFragmentBinding
 import pl.szczodrzynski.edziennik.ext.*
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.login.LoginActivity
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
-import kotlin.coroutines.CoroutineContext
 
-class LabProfileFragment : LazyFragment(), CoroutineScope {
+class LabProfileFragment : BaseFragment<TemplateListPageFragmentBinding, AppCompatActivity>(
+    inflater = TemplateListPageFragmentBinding::inflate,
+) {
     companion object {
         private const val TAG = "LabProfileFragment"
     }
 
-    private lateinit var app: App
-    private lateinit var activity: AppCompatActivity
-    private lateinit var b: TemplateListPageFragmentBinding
+    override fun getRefreshScrollingView() = b.list
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
     private lateinit var adapter: LabJsonAdapter
     private val loginStore by lazy {
         app.db.loginStoreDao().getByIdNow(app.profile.loginStoreId)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as AppCompatActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = TemplateListPageFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onPageCreated(): Boolean { startCoroutineTimer(100L) {
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         adapter = LabJsonAdapter(activity, onJsonElementClick = { item ->
             try {
                 var parent: Any = Unit
@@ -117,7 +96,12 @@ class LabProfileFragment : LazyFragment(), CoroutineScope {
                                 is JsonArray -> {
 
                                 }
-                                is HashMap<*, *> -> app.config[objName] = input
+                                is HashMap<*, *> -> {
+                                    if ("(profile)" in item.key)
+                                        app.profile.config[objName] = input
+                                    else
+                                        app.config[objName] = input
+                                }
                                 else -> {
                                     val field = parent::class.java.getDeclaredField(objName)
                                     field.isAccessible = true
@@ -165,15 +149,13 @@ class LabProfileFragment : LazyFragment(), CoroutineScope {
             setHasFixedSize(true)
             layoutManager = LinearLayoutManager(context)
             addItemDecoration(SimpleDividerItemDecoration(context))
-            addOnScrollListener(onScrollListener)
         }
 
         // show/hide relevant views
         b.progressBar.isVisible = false
         b.list.isVisible = true
         b.noData.isVisible = false
-
-    }; return true }
+    }
 
     private fun showJson() {
         val json = JsonObject().also { json ->
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncDialog.kt
index abf48b45..88a241de 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncDialog.kt
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.DialogBellSyncBinding
 import pl.szczodrzynski.edziennik.ext.resolveDrawable
 import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.utils.models.Time
 
 class BellSyncDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncTimeChooseDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncTimeChooseDialog.kt
index 6e11a50d..9cfcfd6c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncTimeChooseDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncTimeChooseDialog.kt
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.databinding.DialogBellSyncTimeChooseBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.utils.TextInputDropDown
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ChangelogDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ChangelogDialog.kt
index acce8d54..bafe03b2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ChangelogDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ChangelogDialog.kt
@@ -9,7 +9,7 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.ext.dp
-import pl.szczodrzynski.edziennik.ui.dialogs.base.ViewDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.ViewDialog
 import pl.szczodrzynski.edziennik.utils.BetterLinkMovementMethod
 import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ErrorDetailsDialog.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDetailsDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ErrorDetailsDialog.kt
index 10822787..c124db7b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ErrorDetailsDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.error
+package pl.szczodrzynski.edziennik.ui.dialogs
 
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.ext.*
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
 
 class ErrorDetailsDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ProfileRemoveDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ProfileRemoveDialog.kt
index 6deb0b06..c6bd8d0a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ProfileRemoveDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ProfileRemoveDialog.kt
@@ -10,7 +10,7 @@ import kotlinx.coroutines.*
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
 
 class ProfileRemoveDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/QrScannerDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/QrScannerDialog.kt
index 1d0c7707..43d1a874 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/QrScannerDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/QrScannerDialog.kt
@@ -8,7 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
 import me.dm7.barcodescanner.zxing.ZXingScannerView
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.ext.dp
-import pl.szczodrzynski.edziennik.ui.dialogs.base.ViewDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.ViewDialog
 
 class QrScannerDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/StyledTextDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/StyledTextDialog.kt
index f8e720fb..065b3ce7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/StyledTextDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/StyledTextDialog.kt
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.StyledTextDialogBinding
 import pl.szczodrzynski.edziennik.ext.isNightMode
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.utils.DefaultTextStyles
 import pl.szczodrzynski.edziennik.core.manager.TextStylingManager.HtmlMode.SIMPLE
 import pl.szczodrzynski.edziennik.core.manager.TextStylingManager.StylingConfig
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AgendaConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AgendaConfigDialog.kt
index 5cc4ff3f..81a65a11 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AgendaConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AgendaConfigDialog.kt
@@ -10,7 +10,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.DialogConfigAgendaBinding
 import pl.szczodrzynski.edziennik.ext.onChange
-import pl.szczodrzynski.edziennik.ui.dialogs.base.ConfigDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.ConfigDialog
 
 class AgendaConfigDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AppLanguageDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AppLanguageDialog.kt
index 751c91de..9d145700 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AppLanguageDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AppLanguageDialog.kt
@@ -6,7 +6,7 @@ package pl.szczodrzynski.edziennik.ui.dialogs.settings
 
 import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
 
 class AppLanguageDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AttendanceConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AttendanceConfigDialog.kt
index b4734141..5b63458d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AttendanceConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AttendanceConfigDialog.kt
@@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.AttendanceConfigDialogBinding
 import pl.szczodrzynski.edziennik.ext.onChange
-import pl.szczodrzynski.edziennik.ui.dialogs.base.ConfigDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.ConfigDialog
 
 class AttendanceConfigDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/BellSyncConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/BellSyncConfigDialog.kt
index 65539ad4..373a8b0d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/BellSyncConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/BellSyncConfigDialog.kt
@@ -10,7 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.widget.addTextChangedListener
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.DialogEditTextBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.utils.models.Time
 
 class BellSyncConfigDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/GradesConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/GradesConfigDialog.kt
index 2d946083..091034fd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/GradesConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/GradesConfigDialog.kt
@@ -16,7 +16,7 @@ import pl.szczodrzynski.edziennik.ext.join
 import pl.szczodrzynski.edziennik.ext.onChange
 import pl.szczodrzynski.edziennik.ext.onClick
 import pl.szczodrzynski.edziennik.ext.setOnSelectedListener
-import pl.szczodrzynski.edziennik.ui.dialogs.base.ConfigDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.ConfigDialog
 import pl.szczodrzynski.edziennik.core.manager.GradesManager.Companion.COLOR_MODE_DEFAULT
 import pl.szczodrzynski.edziennik.core.manager.GradesManager.Companion.COLOR_MODE_WEIGHTED
 import pl.szczodrzynski.edziennik.core.manager.GradesManager.Companion.ORDER_BY_DATE_DESC
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MessagesConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MessagesConfigDialog.kt
index 0e5696db..b51c9aeb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MessagesConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MessagesConfigDialog.kt
@@ -8,7 +8,7 @@ import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.MessagesConfigDialogBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.base.ConfigDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.ConfigDialog
 
 class MessagesConfigDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MiniMenuConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MiniMenuConfigDialog.kt
index f9650b45..70269968 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MiniMenuConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MiniMenuConfigDialog.kt
@@ -11,7 +11,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.ext.resolveString
 import pl.szczodrzynski.edziennik.data.enums.NavTarget
 import pl.szczodrzynski.edziennik.data.enums.NavTargetLocation
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
 
 class MiniMenuConfigDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/NotificationFilterDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/NotificationFilterDialog.kt
index 6c53bb11..01d3f9ae 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/NotificationFilterDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/NotificationFilterDialog.kt
@@ -9,7 +9,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.enums.NotificationType
 import pl.szczodrzynski.edziennik.ext.resolveString
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
 
 class NotificationFilterDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
index daeb5926..a0fb13a1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
@@ -16,7 +16,7 @@ import pl.szczodrzynski.edziennik.ext.dp
 import pl.szczodrzynski.edziennik.ext.onChange
 import pl.szczodrzynski.edziennik.ext.onClick
 import pl.szczodrzynski.edziennik.ui.dialogs.ProfileRemoveDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 
 class ProfileConfigDialog(
     activity: MainActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/SyncIntervalDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/SyncIntervalDialog.kt
index b64ce774..82aa03b3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/SyncIntervalDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/SyncIntervalDialog.kt
@@ -9,7 +9,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.ext.HOUR
 import pl.szczodrzynski.edziennik.ext.MINUTE
 import pl.szczodrzynski.edziennik.ext.getSyncInterval
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
 
 class SyncIntervalDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ThemeChooserDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ThemeChooserDialog.kt
index 0d1f2603..d3a81b46 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ThemeChooserDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ThemeChooserDialog.kt
@@ -7,7 +7,7 @@ package pl.szczodrzynski.edziennik.ui.dialogs.settings
 import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.enums.Theme
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
 
 class ThemeChooserDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/TimetableConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/TimetableConfigDialog.kt
index 09893c6a..e05aaa8b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/TimetableConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/TimetableConfigDialog.kt
@@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.TimetableConfigDialogBinding
 import pl.szczodrzynski.edziennik.ext.Intent
-import pl.szczodrzynski.edziennik.ui.dialogs.base.ConfigDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.ConfigDialog
 import pl.szczodrzynski.edziennik.ui.timetable.TimetableFragment
 
 class TimetableConfigDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegisterUnavailableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegisterUnavailableDialog.kt
index 3045b5d6..c99d132b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegisterUnavailableDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegisterUnavailableDialog.kt
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
 import pl.szczodrzynski.edziennik.databinding.DialogRegisterUnavailableBinding
 import pl.szczodrzynski.edziennik.ext.onClick
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.utils.Utils
 
 class RegisterUnavailableDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/ServerMessageDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/ServerMessageDialog.kt
index b0f4f3fa..d396065b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/ServerMessageDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/ServerMessageDialog.kt
@@ -6,7 +6,7 @@ package pl.szczodrzynski.edziennik.ui.dialogs.sync
 
 import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
 
 class ServerMessageDialog(
     activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt
index e5d4472c..d43f2499 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.data.enums.FeatureType
 import pl.szczodrzynski.edziennik.ext.hasFeature
 import pl.szczodrzynski.edziennik.ext.resolveString
 import pl.szczodrzynski.edziennik.data.enums.NavTarget
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
 import pl.szczodrzynski.edziennik.ui.messages.list.MessagesFragment
 
 class SyncViewListDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateAvailableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateAvailableDialog.kt
index c6766ece..9e084510 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateAvailableDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateAvailableDialog.kt
@@ -10,7 +10,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.ext.Intent
 import pl.szczodrzynski.edziennik.sync.UpdateDownloaderService
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateProgressDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateProgressDialog.kt
index cfd1ba79..3dc95c06 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateProgressDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateProgressDialog.kt
@@ -19,7 +19,7 @@ import pl.szczodrzynski.edziennik.databinding.UpdateProgressDialogBinding
 import pl.szczodrzynski.edziennik.ext.getInt
 import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
 import pl.szczodrzynski.edziennik.core.work.UpdateStateEvent
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.utils.Utils
 
 class UpdateProgressDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDialog.kt
deleted file mode 100644
index 20f47522..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDialog.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-11-13.
- */
-
-package pl.szczodrzynski.edziennik.ui.error
-
-import android.util.Log
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
-import kotlin.coroutines.CoroutineContext
-
-class ErrorDialog(
-        val activity: AppCompatActivity,
-        val exception: Exception
-) : CoroutineScope {
-    companion object {
-        private const val TAG = "ErrorDialog"
-    }
-
-    private lateinit var job: Job
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    private val app by lazy { activity.application as App }
-    private lateinit var b: DialogLessonDetailsBinding
-    private lateinit var dialog: AlertDialog
-
-    init { run {
-        job = Job()
-
-        dialog = MaterialAlertDialogBuilder(activity)
-                .setTitle(R.string.error_occured)
-                .setMessage(exception.message + "\n" + Log.getStackTraceString(exception))
-                .setPositiveButton(R.string.ok) { _, _ ->
-                    dialog.dismiss()
-                }
-                .show()
-    }}
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventDetailsDialog.kt
index 5882a159..f3cf1287 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventDetailsDialog.kt
@@ -28,7 +28,7 @@ import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.databinding.DialogEventDetailsBinding
 import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.data.enums.NavTarget
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.ui.notes.setupNotesButton
 import pl.szczodrzynski.edziennik.ui.timetable.TimetableFragment
 import pl.szczodrzynski.edziennik.utils.BetterLink
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventManualDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventManualDialog.kt
index a9a054c7..234cad89 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventManualDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventManualDialog.kt
@@ -44,9 +44,9 @@ import pl.szczodrzynski.edziennik.ext.onClick
 import pl.szczodrzynski.edziennik.ext.removeFromParent
 import pl.szczodrzynski.edziennik.ext.setText
 import pl.szczodrzynski.edziennik.ext.setTintColor
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.RegistrationConfigDialog
-import pl.szczodrzynski.edziennik.ui.views.TimeDropdown.Companion.DISPLAY_LESSONS
+import pl.szczodrzynski.edziennik.ui.base.views.TimeDropdown.Companion.DISPLAY_LESSONS
 import pl.szczodrzynski.edziennik.utils.Anim
 import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 import pl.szczodrzynski.edziennik.core.manager.TextStylingManager.HtmlMode.SIMPLE
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/feedback/FeedbackFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/feedback/FeedbackFragment.kt
index 793aedb1..a15d1b8d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/feedback/FeedbackFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/feedback/FeedbackFragment.kt
@@ -6,20 +6,18 @@ import android.graphics.BitmapFactory
 import android.graphics.Canvas
 import android.graphics.Color
 import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.PopupMenu
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
 import coil.imageLoader
 import coil.request.ImageRequest
 import com.github.bassaer.chatmessageview.model.IChatUser
 import com.github.bassaer.chatmessageview.model.Message
 import com.github.bassaer.chatmessageview.view.ChatView
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -31,25 +29,16 @@ import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage
 import pl.szczodrzynski.edziennik.databinding.FragmentFeedbackBinding
 import pl.szczodrzynski.edziennik.ext.crc16
 import pl.szczodrzynski.edziennik.ext.onClick
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.Utils.openUrl
 import timber.log.Timber
-import java.util.*
+import java.util.Calendar
 import kotlin.collections.set
-import kotlin.coroutines.CoroutineContext
 
-class FeedbackFragment : Fragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "FeedbackFragment"
-    }
-
-    private lateinit var app: App
-    private lateinit var activity: AppCompatActivity
-    private lateinit var b: FragmentFeedbackBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
+class FeedbackFragment : BaseFragment<FragmentFeedbackBinding, AppCompatActivity>(
+    inflater = FragmentFeedbackBinding::inflate,
+) {
 
     private val chatView: ChatView by lazy { b.chatView }
     private val api by lazy { SzkolnyApi(app) }
@@ -58,18 +47,6 @@ class FeedbackFragment : Fragment(), CoroutineScope {
 
     private var receiver: BroadcastReceiver? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as AppCompatActivity?) ?: return null
-        if (context == null)
-            return null
-        app = activity.application as App
-        // activity, context and profile is valid
-        b = FragmentFeedbackBinding.inflate(inflater)
-        // prevent doubled received messages on enter
-        EventBus.getDefault().removeStickyEvent(FeedbackMessageEvent::class.java)
-        return b.root
-    }
-
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     fun onFeedbackMessageEvent(event: FeedbackMessageEvent) {
         EventBus.getDefault().removeStickyEvent(event)
@@ -143,10 +120,8 @@ class FeedbackFragment : Fragment(), CoroutineScope {
         }
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        // TODO check if app, activity, b can be null
-        if (!isAdded)
-            return
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
+        EventBus.getDefault().removeStickyEvent(FeedbackMessageEvent::class.java)
 
         b.faqText.setOnClickListener { openFaq() }
         b.faqButton.setOnClickListener { openFaq() }
@@ -163,46 +138,44 @@ class FeedbackFragment : Fragment(), CoroutineScope {
             setMessageMarginBottom(5)
         }
 
-        launch {
-            val messages = withContext(Dispatchers.Default) {
-                val messages = app.db.feedbackMessageDao().allNow
-                isDev = App.devMode && messages.any { it.deviceId != null }
-                messages
-            }
+        val messages = withContext(Dispatchers.IO) {
+            val messages = app.db.feedbackMessageDao().allNow
+            isDev = App.devMode && messages.any { it.deviceId != null }
+            messages
+        }
 
-            b.targetDeviceLayout.visibility = if (isDev) View.VISIBLE else View.GONE
-            b.targetDeviceDropDown.onClick {
-                launchDeviceSelection()
-            }
+        b.targetDeviceLayout.visibility = if (isDev) View.VISIBLE else View.GONE
+        b.targetDeviceDropDown.onClick {
+            launchDeviceSelection()
+        }
 
-            if (isDev) {
-                messages.firstOrNull { it.received && it.devId == null }?.let {
-                    currentDeviceId = it.deviceId
+        if (isDev) {
+            messages.firstOrNull { it.received && it.devId == null }?.let {
+                currentDeviceId = it.deviceId
+                b.targetDeviceDropDown.setText("${it.senderName} (${it.deviceId}) - ${it.deviceName}")
+            }
+            // handle notification intent
+            arguments?.getString("feedbackMessageDeviceId")?.let { deviceId ->
+                messages.firstOrNull { it.received && it.deviceId == deviceId && it.devId == null }?.let {
+                    currentDeviceId = deviceId
                     b.targetDeviceDropDown.setText("${it.senderName} (${it.deviceId}) - ${it.deviceName}")
                 }
-                // handle notification intent
-                arguments?.getString("feedbackMessageDeviceId")?.let { deviceId ->
-                    messages.firstOrNull { it.received && it.deviceId == deviceId && it.devId == null }?.let {
-                        currentDeviceId = deviceId
-                        b.targetDeviceDropDown.setText("${it.senderName} (${it.deviceId}) - ${it.deviceName}")
-                    }
-                }
-                b.chatLayout.visibility = View.VISIBLE
-                b.inputLayout.visibility = View.GONE
-            }
-            else if (messages.isEmpty()) {
-                b.chatLayout.visibility = View.GONE
-                b.inputLayout.visibility = View.VISIBLE
             }
+            b.chatLayout.visibility = View.VISIBLE
+            b.inputLayout.visibility = View.GONE
+        }
+        else if (messages.isEmpty()) {
+            b.chatLayout.visibility = View.GONE
+            b.inputLayout.visibility = View.VISIBLE
+        }
 
-            loadMessages(messages)
+        loadMessages(messages)
 
-            b.sendButton.onClick {
-                send(b.textInput.text.toString())
-            }
-            chatView.setOnClickSendButtonListener(View.OnClickListener {
-                send(chatView.inputText)
-            })
+        b.sendButton.onClick {
+            send(b.textInput.text.toString())
+        }
+        chatView.setOnClickSendButtonListener {
+            send(chatView.inputText)
         }
     }
 
@@ -275,14 +248,4 @@ class FeedbackFragment : Fragment(), CoroutineScope {
     private fun openFaq() {
         openUrl(activity, "http://szkolny.eu/pomoc/")
     }
-
-    override fun onResume() {
-        super.onResume()
-        EventBus.getDefault().register(this)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        EventBus.getDefault().unregister(this)
-    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeDetailsDialog.kt
index c474b5b4..5c249a9a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeDetailsDialog.kt
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.data.db.full.GradeFull
 import pl.szczodrzynski.edziennik.databinding.DialogGradeDetailsBinding
 import pl.szczodrzynski.edziennik.ext.onClick
 import pl.szczodrzynski.edziennik.ext.setTintColor
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.GradesConfigDialog
 import pl.szczodrzynski.edziennik.ui.notes.setupNotesButton
 import pl.szczodrzynski.edziennik.utils.BetterLink
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt
index a4ceb6d9..380e0b08 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt
@@ -4,50 +4,51 @@
 
 package pl.szczodrzynski.edziennik.ui.grades
 
-import android.os.AsyncTask
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import kotlinx.coroutines.*
-import pl.szczodrzynski.edziennik.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.core.manager.GradesManager
 import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.enums.MetadataType
 import pl.szczodrzynski.edziennik.data.db.full.GradeFull
-import pl.szczodrzynski.edziennik.databinding.GradesListFragmentBinding
-import pl.szczodrzynski.edziennik.ext.*
+import pl.szczodrzynski.edziennik.data.enums.MetadataType
 import pl.szczodrzynski.edziennik.data.enums.NavTarget
+import pl.szczodrzynski.edziennik.databinding.GradesListFragmentBinding
+import pl.szczodrzynski.edziennik.ext.Bundle
+import pl.szczodrzynski.edziennik.ext.averageOrNull
+import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.GradesConfigDialog
 import pl.szczodrzynski.edziennik.ui.grades.models.GradesAverages
 import pl.szczodrzynski.edziennik.ui.grades.models.GradesSemester
 import pl.szczodrzynski.edziennik.ui.grades.models.GradesStats
 import pl.szczodrzynski.edziennik.ui.grades.models.GradesSubject
-import pl.szczodrzynski.edziennik.core.manager.GradesManager
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
-import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
-import kotlin.coroutines.CoroutineContext
 import kotlin.math.max
 
-class GradesListFragment : Fragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "GradesFragment"
-    }
+class GradesListFragment : BaseFragment<GradesListFragmentBinding, MainActivity>(
+    inflater = GradesListFragmentBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: GradesListFragmentBinding
+    override fun getMarkAsReadType() = MetadataType.GRADE
+    override fun getBottomSheetItems() = listOf(
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_grades_config)
+            .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                GradesConfigDialog(activity, true, null, null).show()
+            },
+    )
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
     private val manager
         get() = app.gradesManager
     private val dontCountEnabled
@@ -56,18 +57,7 @@ class GradesListFragment : Fragment(), CoroutineScope {
         get() = manager.dontCountGrades
     private var expandSubjectId = 0L
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = GradesListFragmentBinding.inflate(inflater)
-        b.refreshLayout.setParent(activity.swipeRefreshLayout)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { startCoroutineTimer(100L) {
-        if (!isAdded) return@startCoroutineTimer
-
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         expandSubjectId = arguments?.getLong("gradesSubjectId") ?: 0L
 
         val adapter = GradesAdapter(activity)
@@ -92,7 +82,6 @@ class GradesListFragment : Fragment(), CoroutineScope {
                 b.list.apply {
                     setHasFixedSize(true)
                     layoutManager = LinearLayoutManager(context)
-                    addOnScrollListener(b.refreshLayout.onScrollListener)
                 }
             }
             adapter.notifyDataSetChanged()
@@ -121,7 +110,7 @@ class GradesListFragment : Fragment(), CoroutineScope {
             val otherSemester = subject.semesters.firstOrNull { it != semester }
             var gradeSumOtherSemester = otherSemester?.averages?.normalWeightedSum
             var gradeCountOtherSemester = otherSemester?.averages?.normalWeightedCount
-            if (gradeSumOtherSemester ?: 0f == 0f || gradeCountOtherSemester ?: 0f == 0f) {
+            if ((gradeSumOtherSemester ?: 0f) == 0f || (gradeCountOtherSemester ?: 0f) == 0f) {
                 gradeSumOtherSemester = otherSemester?.averages?.normalSum
                 gradeCountOtherSemester = otherSemester?.averages?.normalCount?.toFloat()
             }
@@ -137,27 +126,7 @@ class GradesListFragment : Fragment(), CoroutineScope {
                     "finalOtherSemester" to otherSemester?.finalGrade?.value
             ))
         }
-
-        activity.bottomSheet.prependItems(
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_grades_config)
-                        .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
-                        .withOnClickListener(View.OnClickListener {
-                            activity.bottomSheet.close()
-                            GradesConfigDialog(activity, true, null, null).show()
-                        }),
-                BottomSheetSeparatorItem(true),
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_mark_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
-                        .withOnClickListener(View.OnClickListener {
-                            activity.bottomSheet.close()
-                            AsyncTask.execute { App.db.metadataDao().setAllSeen(App.profileId, MetadataType.GRADE, true) }
-                            Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show()
-                        })
-        )
-        activity.gainAttention()
-    }}
+    }
 
     private fun expandSubject(adapter: GradesAdapter) {
         var expandSubjectModel: GradesSubject? = null
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/editor/GradesEditorFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/editor/GradesEditorFragment.kt
index c2ec00d4..442dfd64 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/editor/GradesEditorFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/editor/GradesEditorFragment.kt
@@ -4,41 +4,34 @@ import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
 import android.text.InputType
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.core.manager.GradesManager.Companion.YEAR_1_AVG_2_AVG
+import pl.szczodrzynski.edziennik.core.manager.GradesManager.Companion.YEAR_1_AVG_2_SEM
+import pl.szczodrzynski.edziennik.core.manager.GradesManager.Companion.YEAR_1_SEM_2_AVG
+import pl.szczodrzynski.edziennik.core.manager.GradesManager.Companion.YEAR_ALL_GRADES
 import pl.szczodrzynski.edziennik.data.db.entity.Grade
 import pl.szczodrzynski.edziennik.databinding.FragmentGradesEditorBinding
 import pl.szczodrzynski.edziennik.ext.getFloat
 import pl.szczodrzynski.edziennik.ext.getInt
 import pl.szczodrzynski.edziennik.ext.getLong
 import pl.szczodrzynski.edziennik.ext.input
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.utils.Colors
-import pl.szczodrzynski.edziennik.core.manager.GradesManager.Companion.YEAR_1_AVG_2_AVG
-import pl.szczodrzynski.edziennik.core.manager.GradesManager.Companion.YEAR_1_AVG_2_SEM
-import pl.szczodrzynski.edziennik.core.manager.GradesManager.Companion.YEAR_1_SEM_2_AVG
-import pl.szczodrzynski.edziennik.core.manager.GradesManager.Companion.YEAR_ALL_GRADES
 import timber.log.Timber
 import java.text.DecimalFormat
-import java.util.*
+import java.util.Locale
 import kotlin.math.floor
 
-class GradesEditorFragment : Fragment() {
-
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: FragmentGradesEditorBinding
-/*
-    private val navController: NavController by lazy { Navigation.findNavController(b.root) }
-*/
+class GradesEditorFragment : BaseFragment<FragmentGradesEditorBinding, MainActivity>(
+    inflater = FragmentGradesEditorBinding::inflate,
+) {
 
     private val config by lazy { app.profile.config.grades }
 
@@ -61,20 +54,7 @@ class GradesEditorFragment : Fragment() {
     private var averageMode = YEAR_ALL_GRADES // this means the container should be gone
     private var yearAverageBefore = 0.0f
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        if (context == null)
-            return null
-        app = activity.application as App
-        // activity, context and profile is valid
-        b = FragmentGradesEditorBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!isAdded)
-            return
-
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         subjectId = arguments.getLong("subjectId", -1)
         semester = arguments.getInt("semester", 1)
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/CardItemTouchHelperCallback.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/CardItemTouchHelperCallback.kt
index d1a0aa49..160ab095 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/CardItemTouchHelperCallback.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/CardItemTouchHelperCallback.kt
@@ -5,16 +5,22 @@
 package pl.szczodrzynski.edziennik.ui.home
 
 import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.ItemTouchHelper.*
+import androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_DRAG
+import androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_IDLE
+import androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_SWIPE
+import androidx.recyclerview.widget.ItemTouchHelper.DOWN
+import androidx.recyclerview.widget.ItemTouchHelper.LEFT
+import androidx.recyclerview.widget.ItemTouchHelper.UP
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.card.MaterialCardView
 import pl.szczodrzynski.edziennik.ui.home.HomeFragment.Companion.removeCard
 import pl.szczodrzynski.edziennik.ui.home.HomeFragment.Companion.swapCards
-import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
 
-class CardItemTouchHelperCallback(private val cardAdapter: HomeCardAdapter, private val refreshLayout: SwipeRefreshLayoutNoIndicator?) : ItemTouchHelper.Callback() {
+class CardItemTouchHelperCallback(
+    private val cardAdapter: HomeCardAdapter,
+    private val onCanRefresh: ((canRefresh: Boolean) -> Unit)?,
+) : ItemTouchHelper.Callback() {
     companion object {
-        private const val TAG = "CardItemTouchHelperCallback"
         private const val DRAG_FLAGS = UP or DOWN
         private const val SWIPE_FLAGS = LEFT
     }
@@ -45,10 +51,10 @@ class CardItemTouchHelperCallback(private val cardAdapter: HomeCardAdapter, priv
         if (viewHolder != null && (actionState == ACTION_STATE_DRAG || actionState == ACTION_STATE_SWIPE)) {
             dragCardView = viewHolder.itemView as MaterialCardView
             dragCardView?.isDragged = true
-            refreshLayout?.isEnabled = false
+            onCanRefresh?.invoke(false)
         }
         else if (actionState == ACTION_STATE_IDLE && dragCardView != null) {
-            refreshLayout?.isEnabled = true
+            onCanRefresh?.invoke(true)
             dragCardView?.isDragged = false
             dragCardView = null
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeConfigDialog.kt
index 256daf6e..b68f5aee 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeConfigDialog.kt
@@ -8,7 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
 import pl.szczodrzynski.edziennik.ui.home.HomeCard.Companion.CARD_EVENTS
 import pl.szczodrzynski.edziennik.ui.home.HomeCard.Companion.CARD_GRADES
 import pl.szczodrzynski.edziennik.ui.home.HomeCard.Companion.CARD_LUCKY_NUMBER
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt
index 9b1692db..4fa6c38a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt
@@ -5,22 +5,19 @@
 package pl.szczodrzynski.edziennik.ui.home
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.View.OnClickListener
-import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.view.AccessibilityDelegateCompat
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat
 import androidx.core.widget.NestedScrollView
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial.Icon
 import eu.szkolny.font.SzkolnyFont
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.BuildConfig
 import pl.szczodrzynski.edziennik.MainActivity
@@ -29,16 +26,22 @@ import pl.szczodrzynski.edziennik.data.enums.FeatureType
 import pl.szczodrzynski.edziennik.databinding.FragmentHomeBinding
 import pl.szczodrzynski.edziennik.ext.hasUIFeature
 import pl.szczodrzynski.edziennik.ext.onClick
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.StudentNumberDialog
-import pl.szczodrzynski.edziennik.ui.home.cards.*
+import pl.szczodrzynski.edziennik.ui.home.cards.HomeArchiveCard
+import pl.szczodrzynski.edziennik.ui.home.cards.HomeAvailabilityCard
+import pl.szczodrzynski.edziennik.ui.home.cards.HomeEventsCard
+import pl.szczodrzynski.edziennik.ui.home.cards.HomeGradesCard
+import pl.szczodrzynski.edziennik.ui.home.cards.HomeLuckyNumberCard
+import pl.szczodrzynski.edziennik.ui.home.cards.HomeNotesCard
+import pl.szczodrzynski.edziennik.ui.home.cards.HomeTimetableCard
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
-import kotlin.coroutines.CoroutineContext
 
-class HomeFragment : Fragment(), CoroutineScope {
+class HomeFragment : BaseFragment<FragmentHomeBinding, MainActivity>(
+    inflater = FragmentHomeBinding::inflate,
+) {
     companion object {
-        private const val TAG = "HomeFragment"
-
         fun swapCards(fromPosition: Int, toPosition: Int, cardAdapter: HomeCardAdapter): Boolean {
             val fromCard = cardAdapter.items[fromPosition]
             val toCard = cardAdapter.items[toPosition]
@@ -75,75 +78,58 @@ class HomeFragment : Fragment(), CoroutineScope {
         }
     }
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: FragmentHomeBinding
+    override fun getBottomSheetItems() = listOf(
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_add_remove_cards)
+            .withIcon(Icon.cmd_card_bulleted_settings_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                HomeConfigDialog(activity, reloadOnDismiss = true).show()
+            },
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_set_student_number)
+            .withIcon(SzkolnyFont.Icon.szf_clipboard_list_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                StudentNumberDialog(activity, app.profile) {
+                    app.profileSave()
+                }
+            },
+        BottomSheetSeparatorItem(true),
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_mark_everything_as_read)
+            .withIcon(Icon.cmd_eye_check_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                launch(Dispatchers.IO) {
+                    if (!app.data.uiConfig.enableMarkAsReadAnnouncements) {
+                        app.db.metadataDao()
+                            .setAllSeenExceptMessagesAndAnnouncements(App.profileId, true)
+                    } else {
+                        app.db.metadataDao().setAllSeenExceptMessages(App.profileId, true)
+                    }
+                }
+
+                Toast.makeText(
+                    activity,
+                    R.string.main_menu_mark_as_read_success,
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+    )
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
     private val manager
         get() = app.permissionManager
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = FragmentHomeBinding.inflate(inflater)
-        b.refreshLayout.setParent(activity.swipeRefreshLayout)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        // TODO check if app, activity, b can be null
-        if (!isAdded)
-            return
 
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         if (!manager.isNotificationPermissionGranted) {
             manager.requestNotificationsPermission(activity, 0, false){}
         }
 
-        activity.bottomSheet.prependItems(
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_add_remove_cards)
-                        .withIcon(Icon.cmd_card_bulleted_settings_outline)
-                        .withOnClickListener(OnClickListener {
-                            activity.bottomSheet.close()
-                            HomeConfigDialog(activity, reloadOnDismiss = true).show()
-                        }),
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_set_student_number)
-                        .withIcon(SzkolnyFont.Icon.szf_clipboard_list_outline)
-                        .withOnClickListener(OnClickListener {
-                            activity.bottomSheet.close()
-                            StudentNumberDialog(activity, app.profile) {
-                                app.profileSave()
-                            }
-                        }),
-                BottomSheetSeparatorItem(true),
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_mark_everything_as_read)
-                        .withIcon(Icon.cmd_eye_check_outline)
-                        .withOnClickListener(OnClickListener {
-                            activity.bottomSheet.close()
-                            launch { withContext(Dispatchers.Default) {
-                                if (!app.data.uiConfig.enableMarkAsReadAnnouncements) {
-                                    app.db.metadataDao().setAllSeenExceptMessagesAndAnnouncements(App.profileId, true)
-                                } else {
-                                    app.db.metadataDao().setAllSeenExceptMessages(App.profileId, true)
-                                }
-                            } }
-
-                            Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show()
-                        })
-        )
         b.configureCards.onClick {
             HomeConfigDialog(activity, reloadOnDismiss = true).show()
         }
 
-        b.scrollView.setOnScrollChangeListener { _: NestedScrollView?, _: Int, scrollY: Int, _: Int, _: Int ->
-            b.refreshLayout.isEnabled = scrollY == 0
-        }
-
         val cards = app.profile.config.ui.homeCards.filter { it.profileId == app.profile.id }.toMutableList()
         if (cards.isEmpty()) {
             cards += listOfNotNull(
@@ -184,7 +170,9 @@ class HomeFragment : Fragment(), CoroutineScope {
         }
 
         val adapter = HomeCardAdapter(items)
-        val itemTouchHelper = ItemTouchHelper(CardItemTouchHelperCallback(adapter, b.refreshLayout))
+        val itemTouchHelper = ItemTouchHelper(CardItemTouchHelperCallback(adapter) {
+            canRefreshDisabled = !it
+        })
         adapter.itemTouchHelper = itemTouchHelper
         b.list.layoutManager = LinearLayoutManager(activity)
         b.list.adapter = adapter
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkFragment.kt
index f6981452..7d7a99e2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkFragment.kt
@@ -4,116 +4,49 @@
 
 package pl.szczodrzynski.edziennik.ui.homework
 
-import android.os.AsyncTask
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import eu.szkolny.font.SzkolnyFont
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.enums.MetadataType
-import pl.szczodrzynski.edziennik.databinding.HomeworkFragmentBinding
+import pl.szczodrzynski.edziennik.databinding.BasePagerFragmentBinding
 import pl.szczodrzynski.edziennik.ext.Bundle
-import pl.szczodrzynski.edziennik.ext.addOnPageSelectedListener
-import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
+import pl.szczodrzynski.edziennik.ui.base.fragment.PagerFragment
 import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
-import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
-import kotlin.coroutines.CoroutineContext
 
-class HomeworkFragment : Fragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "HomeworkFragment"
-        var pageSelection = 0
-    }
+class HomeworkFragment : PagerFragment<BasePagerFragmentBinding, MainActivity>(
+    inflater = BasePagerFragmentBinding::inflate,
+), CoroutineScope {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: HomeworkFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = HomeworkFragmentBinding.inflate(inflater)
-        b.refreshLayout.setParent(activity.swipeRefreshLayout)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!isAdded) return
-
-        activity.bottomSheet.prependItems(
-                BottomSheetPrimaryItem(true)
-                .withTitle(R.string.menu_add_event)
-                .withDescription(R.string.menu_add_event_desc)
-                .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline)
-                .withOnClickListener(View.OnClickListener {
-                    activity.bottomSheet.close()
-                    EventManualDialog(activity, App.profileId, defaultType = Event.TYPE_HOMEWORK).show()
-                }),
-        BottomSheetSeparatorItem(true),
+    override fun getFab() = R.string.add to CommunityMaterial.Icon3.cmd_plus
+    override fun getMarkAsReadType() = MetadataType.HOMEWORK
+    override fun getBottomSheetItems() = listOf(
         BottomSheetPrimaryItem(true)
-                .withTitle(R.string.menu_mark_as_read)
-                .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
-                .withOnClickListener(View.OnClickListener {
-                    activity.bottomSheet.close()
-                    AsyncTask.execute { app.db.metadataDao().setAllSeen(App.profileId, MetadataType.HOMEWORK, true) }
-                    Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show()
-                }))
-
-        val pagerAdapter = FragmentLazyPagerAdapter(
-            parentFragmentManager,
-                b.refreshLayout,
-                listOf(
-                        HomeworkListFragment().apply {
-                            arguments = Bundle("homeworkDate" to HomeworkDate.CURRENT)
-                        } to getString(R.string.homework_tab_current),
-
-                        HomeworkListFragment().apply {
-                            arguments = Bundle("homeworkDate" to HomeworkDate.PAST)
-                        } to getString(R.string.homework_tab_past)
-                )
-        )
-        b.viewPager.apply {
-            offscreenPageLimit = 1
-            adapter = pagerAdapter
-            currentItem = pageSelection
-            addOnPageSelectedListener {
-                pageSelection = it
-            }
-            b.tabLayout.setupWithViewPager(this)
-        }
-
-        activity.navView.apply {
-            bottomBar.apply {
-                fabEnable = true
-                fabExtendedText = getString(R.string.add)
-                fabIcon = CommunityMaterial.Icon3.cmd_plus
-            }
-
-            setFabOnClickListener(View.OnClickListener {
+            .withTitle(R.string.menu_add_event)
+            .withDescription(R.string.menu_add_event_desc)
+            .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
                 EventManualDialog(activity, App.profileId, defaultType = Event.TYPE_HOMEWORK).show()
-            })
-        }
+            }
+    )
 
-        activity.gainAttention()
-        activity.gainAttentionFAB()
+    override fun getTabLayout() = b.tabLayout
+    override fun getViewPager() = b.viewPager
+    override suspend fun onCreatePages() = listOf(
+        HomeworkListFragment().apply {
+            arguments = Bundle("homeworkDate" to HomeworkDate.CURRENT)
+        } to getString(R.string.homework_tab_current),
+        HomeworkListFragment().apply {
+            arguments = Bundle("homeworkDate" to HomeworkDate.PAST)
+        } to getString(R.string.homework_tab_past)
+    )
+
+    override suspend fun onFabClick() {
+        EventManualDialog(activity, App.profileId, defaultType = Event.TYPE_HOMEWORK).show()
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkListFragment.kt
index 4c354801..0f4b8aa0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkListFragment.kt
@@ -1,52 +1,28 @@
 package pl.szczodrzynski.edziennik.ui.homework
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.databinding.HomeworkListFragmentBinding
 import pl.szczodrzynski.edziennik.ext.getInt
-import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.event.EventDetailsDialog
 import pl.szczodrzynski.edziennik.ui.event.EventListAdapter
 import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import pl.szczodrzynski.edziennik.utils.models.Date
-import kotlin.coroutines.CoroutineContext
 
-class HomeworkListFragment : LazyFragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "HomeworkListFragment"
-    }
+class HomeworkListFragment : BaseFragment<HomeworkListFragmentBinding, MainActivity>(
+    inflater = HomeworkListFragmentBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: HomeworkListFragmentBinding
+    override fun getRefreshScrollingView() = b.list
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = HomeworkListFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onPageCreated(): Boolean { startCoroutineTimer(100L) {
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         val homeworkDate = arguments.getInt("homeworkDate", HomeworkDate.CURRENT)
 
         val today = Date.getToday()
@@ -87,7 +63,6 @@ class HomeworkListFragment : LazyFragment(), CoroutineScope {
             }
 
             // show/hide relevant views
-            setSwipeToRefresh(events.isEmpty())
             b.progressBar.isVisible = false
             b.list.isVisible = events.isNotEmpty()
             b.noData.isVisible = events.isEmpty()
@@ -104,7 +79,6 @@ class HomeworkListFragment : LazyFragment(), CoroutineScope {
                     setHasFixedSize(true)
                     layoutManager = LinearLayoutManager(context)
                     addItemDecoration(SimpleDividerItemDecoration(context))
-                    addOnScrollListener(onScrollListener)
                     this.adapter = adapter
                 }
             }
@@ -112,5 +86,5 @@ class HomeworkListFragment : LazyFragment(), CoroutineScope {
             // reapply the filter
             adapter.getSearchField()?.applyTo(adapter)
         })
-    }; return true }
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt
index 85725f95..6c4b432d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt
@@ -9,6 +9,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavOptions
 import androidx.navigation.Navigation
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -19,8 +20,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.databinding.LoginActivityBinding
-import pl.szczodrzynski.edziennik.ui.error.ErrorSnackbar
-import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch
+import pl.szczodrzynski.edziennik.ui.main.ErrorSnackbar
 import kotlin.coroutines.CoroutineContext
 
 class LoginActivity : AppCompatActivity(), CoroutineScope {
@@ -34,7 +34,7 @@ class LoginActivity : AppCompatActivity(), CoroutineScope {
     lateinit var navOptionsBuilder: NavOptions.Builder
     val nav by lazy { Navigation.findNavController(this, R.id.nav_host_fragment) }
     val errorSnackbar: ErrorSnackbar by lazy { ErrorSnackbar(this) }
-    val swipeRefreshLayout: SwipeRefreshLayoutNoTouch by lazy { b.swipeRefreshLayout }
+    val swipeRefreshLayout: SwipeRefreshLayout by lazy { b.swipeRefreshLayout }
 
     private val job: Job = Job()
     override val coroutineContext: CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/BuildInvalidActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/main/BuildInvalidActivity.kt
similarity index 91%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/base/BuildInvalidActivity.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/main/BuildInvalidActivity.kt
index ac20d2bf..8af52820 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/BuildInvalidActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/main/BuildInvalidActivity.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-27.
  */
 
-package pl.szczodrzynski.edziennik.ui.base
+package pl.szczodrzynski.edziennik.ui.main
 
 import android.graphics.Color
 import android.os.Bundle
@@ -12,7 +12,6 @@ import com.mikepenz.iconics.utils.colorInt
 import pl.szczodrzynski.edziennik.databinding.ActivityBuildInvalidBinding
 import pl.szczodrzynski.edziennik.ext.app
 import pl.szczodrzynski.edziennik.ext.onClick
-import pl.szczodrzynski.edziennik.utils.Themes
 
 class BuildInvalidActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/CrashActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/main/CrashActivity.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/base/CrashActivity.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/main/CrashActivity.kt
index e427ccaf..6184d71d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/CrashActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/main/CrashActivity.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.base
+package pl.szczodrzynski.edziennik.ui.main
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -21,6 +21,7 @@ import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.data.api.szkolny.request.ErrorReportRequest
 import pl.szczodrzynski.edziennik.ext.resolveAttr
 import pl.szczodrzynski.edziennik.ext.resolveColor
+import pl.szczodrzynski.edziennik.ext.resolveStyleAttr
 import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 import kotlin.coroutines.CoroutineContext
 
@@ -88,7 +89,7 @@ class CrashActivity : AppCompatActivity(), CoroutineScope {
 
         val moreInfoButton = findViewById<Button>(R.id.crash_details_btn)
         moreInfoButton.setOnClickListener {
-            MaterialAlertDialogBuilder(this, R.attr.materialAlertDialogMonospaceTheme.resolveAttr(this))
+            MaterialAlertDialogBuilder(this, R.attr.materialAlertDialogMonospaceTheme.resolveStyleAttr(this))
                 .setTitle(R.string.crash_details)
                 .setMessage(BetterHtml.fromHtml(context = null, getErrorString(intent, false)))
                 .setPositiveButton(R.string.close, null)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorSnackbar.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/main/ErrorSnackbar.kt
similarity index 94%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorSnackbar.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/main/ErrorSnackbar.kt
index 89f6eb1d..4cd19a76 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorSnackbar.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/main/ErrorSnackbar.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-13.
  */
 
-package pl.szczodrzynski.edziennik.ui.error
+package pl.szczodrzynski.edziennik.ui.main
 
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
@@ -14,6 +14,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.ui.dialogs.ErrorDetailsDialog
 import pl.szczodrzynski.navlib.getColorFromAttr
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/MainSnackbar.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/main/MainSnackbar.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/base/MainSnackbar.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/main/MainSnackbar.kt
index 93e340b3..05643d47 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/MainSnackbar.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/main/MainSnackbar.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-12-22.
  */
 
-package pl.szczodrzynski.edziennik.ui.base
+package pl.szczodrzynski.edziennik.ui.main
 
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeFragment.kt
index d6726578..574bfe58 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeFragment.kt
@@ -6,22 +6,27 @@ package pl.szczodrzynski.edziennik.ui.messages.compose
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.AutoCompleteTextView
 import android.widget.ScrollView
 import android.widget.Toast
 import androidx.core.view.isVisible
 import androidx.core.widget.addTextChangedListener
-import androidx.fragment.app.Fragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
-import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.core.manager.MessageManager.UIConfig
+import pl.szczodrzynski.edziennik.core.manager.TextStylingManager.HtmlMode.COMPATIBLE
+import pl.szczodrzynski.edziennik.core.manager.TextStylingManager.HtmlMode.ORIGINAL
+import pl.szczodrzynski.edziennik.core.manager.TextStylingManager.StylingConfig
 import pl.szczodrzynski.edziennik.data.api.ERROR_MESSAGE_NOT_SENT
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent
@@ -30,33 +35,49 @@ import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.enums.LoginType
+import pl.szczodrzynski.edziennik.data.enums.NavTarget
 import pl.szczodrzynski.edziennik.databinding.MessagesComposeFragmentBinding
 import pl.szczodrzynski.edziennik.ext.Bundle
 import pl.szczodrzynski.edziennik.ext.DAY
-import pl.szczodrzynski.edziennik.data.enums.NavTarget
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.MessagesConfigDialog
 import pl.szczodrzynski.edziennik.ui.messages.list.MessagesFragment
 import pl.szczodrzynski.edziennik.utils.DefaultTextStyles
-import pl.szczodrzynski.edziennik.core.manager.MessageManager.UIConfig
-import pl.szczodrzynski.edziennik.core.manager.TextStylingManager.HtmlMode.COMPATIBLE
-import pl.szczodrzynski.edziennik.core.manager.TextStylingManager.HtmlMode.ORIGINAL
-import pl.szczodrzynski.edziennik.core.manager.TextStylingManager.StylingConfig
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
-import kotlin.coroutines.CoroutineContext
 
-class MessagesComposeFragment : Fragment(), CoroutineScope {
+class MessagesComposeFragment : BaseFragment<MessagesComposeFragmentBinding, MainActivity>(
+    inflater = MessagesComposeFragmentBinding::inflate,
+) {
     companion object {
         private const val TAG = "MessagesComposeFragment"
     }
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: MessagesComposeFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
+    override fun getFab() = R.string.messages_compose_send to CommunityMaterial.Icon3.cmd_send_outline
+    override fun getBottomSheetItems() = listOf(
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.messages_compose_send_long)
+            .withIcon(CommunityMaterial.Icon3.cmd_send_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                sendMessage()
+            },
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.messages_compose_save_draft)
+            .withIcon(CommunityMaterial.Icon.cmd_content_save_edit_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                saveDraft()
+            },
+        BottomSheetSeparatorItem(true),
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_messages_config)
+            .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                MessagesConfigDialog(activity, false, null, null).show()
+            }
+    )
 
     private val manager
         get() = app.messageManager
@@ -75,25 +96,7 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
     private var discardDraftItem: BottomSheetPrimaryItem? = null
     private var draftMessageId: Long? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        // activity, context and profile is valid
-        b = MessagesComposeFragmentBinding.inflate(inflater)
-        return b.root
-    }
-    override fun onDestroy() {
-        EventBus.getDefault().unregister(this)
-        super.onDestroy()
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        // TODO check if app, activity, b can be null
-        if (!isAdded)
-            return
-
-        EventBus.getDefault().register(this)
-
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         b.breakpoints.visibility = if (App.devMode) View.VISIBLE else View.GONE
         b.breakpoints.setOnClickListener {
             b.breakpoints.isEnabled = true
@@ -110,37 +113,8 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
                 discardDraftDialog()
             }
 
-        activity.bottomSheet.prependItems(
-            BottomSheetPrimaryItem(true)
-                .withTitle(R.string.messages_compose_send_long)
-                .withIcon(CommunityMaterial.Icon3.cmd_send_outline)
-                .withOnClickListener {
-                    activity.bottomSheet.close()
-                    sendMessage()
-                },
-            BottomSheetPrimaryItem(true)
-                .withTitle(R.string.messages_compose_save_draft)
-                .withIcon(CommunityMaterial.Icon.cmd_content_save_edit_outline)
-                .withOnClickListener {
-                    activity.bottomSheet.close()
-                    saveDraft()
-                },
-            BottomSheetSeparatorItem(true),
-            BottomSheetPrimaryItem(true)
-                .withTitle(R.string.menu_messages_config)
-                .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
-                .withOnClickListener {
-                    activity.bottomSheet.close()
-                    MessagesConfigDialog(activity, false, null, null).show()
-                }
-        )
-
-        launch {
-            delay(100)
-            getRecipientList()
-
-            createView()
-        }
+        getRecipientList()
+        createView()
     }
 
     private fun getMessageBody(): String {
@@ -150,18 +124,16 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
             b.text.text?.toString() ?: ""
     }
 
-    private fun getRecipientList() {
+    private suspend fun getRecipientList() {
         if (app.data.messagesConfig.syncRecipientList && System.currentTimeMillis() - app.profile.lastReceiversSync > 1 * DAY * 1000) {
             activity.snackbar("Pobieranie listy odbiorców...")
             EdziennikTask.recipientListGet(App.profileId).enqueue(activity)
         }
         else {
-            launch {
-                val list = withContext(Dispatchers.Default) {
-                    app.db.teacherDao().getAllNow(App.profileId).filter { it.loginId != null }
-                }
-                updateRecipientList(list)
+            val list = withContext(Dispatchers.IO) {
+                app.db.teacherDao().getAllNow(App.profileId).filter { it.loginId != null }
             }
+            updateRecipientList(list)
         }
     }
 
@@ -259,18 +231,10 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
                 changedBody = true
             }
         }
+    }
 
-        activity.navView.bottomBar.apply {
-            fabEnable = true
-            fabExtendedText = getString(R.string.messages_compose_send)
-            fabIcon = CommunityMaterial.Icon3.cmd_send_outline
-
-            setFabOnClickListener {
-                sendMessage()
-            }
-        }
-
-        activity.gainAttentionFAB()
+    override suspend fun onFabClick() {
+        sendMessage()
     }
 
     private fun onBeforeNavigate(): Boolean {
@@ -437,15 +401,13 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
 
     override fun onResume() {
         super.onResume()
-        if (!isAdded || !this::activity.isInitialized)
+        if (!isAdded)
             return
         activity.onBeforeNavigate = this::onBeforeNavigate
     }
 
     override fun onPause() {
         super.onPause()
-        if (!this::activity.isInitialized)
-            return
         activity.onBeforeNavigate = null
     }
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeInfo.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeInfo.kt
deleted file mode 100644
index 71a0e14d..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeInfo.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-4-4.
- */
-
-package pl.szczodrzynski.edziennik.ui.messages.compose
-
-class MessagesComposeInfo(
-        /**
-         * 0 means no attachments.
-         * -1 means unlimited number.
-         */
-        @JvmField var maxAttachmentNumber: Int,
-        /**
-         * -1 means unlimited size.
-         */
-        var attachmentSizeLimit: Long,
-        /**
-         * -1 means unlimited length.
-         */
-        var maxSubjectLength: Int,
-        /**
-         * -1 means unlimited length.
-         */
-        var maxBodyLength: Int
-)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesFragment.kt
index 87327a41..3390ff74 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesFragment.kt
@@ -1,144 +1,72 @@
 package pl.szczodrzynski.edziennik.ui.messages.list
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.databinding.MessagesFragmentBinding
-import pl.szczodrzynski.edziennik.ext.Bundle
-import pl.szczodrzynski.edziennik.ext.addOnPageSelectedListener
 import pl.szczodrzynski.edziennik.data.enums.NavTarget
-import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
+import pl.szczodrzynski.edziennik.databinding.BasePagerFragmentBinding
+import pl.szczodrzynski.edziennik.ext.Bundle
+import pl.szczodrzynski.edziennik.ui.base.fragment.PagerFragment
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.MessagesConfigDialog
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
-import kotlin.coroutines.CoroutineContext
 
-class MessagesFragment : Fragment(), CoroutineScope {
+class MessagesFragment : PagerFragment<BasePagerFragmentBinding, MainActivity>(
+    inflater = BasePagerFragmentBinding::inflate,
+) {
     companion object {
-        private const val TAG = "MessagesFragment"
         var pageSelection = 0
     }
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: MessagesFragmentBinding
+    override fun getFab() = R.string.compose to CommunityMaterial.Icon3.cmd_pencil_outline
+    override fun getBottomSheetItems() = listOf(
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_message_compose)
+            .withIcon(CommunityMaterial.Icon3.cmd_pencil_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                activity.navigate(navTarget = NavTarget.MESSAGE_COMPOSE)
+            },
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_messages_config)
+            .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                MessagesConfigDialog(activity, false, null, null).show()
+            }
+    )
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = MessagesFragmentBinding.inflate(inflater)
-        b.refreshLayout.setParent(activity.swipeRefreshLayout)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!isAdded) return
+    override fun getTabLayout() = b.tabLayout
+    override fun getViewPager() = b.viewPager
+    override suspend fun onCreatePages() = listOf(
+        MessagesListFragment().apply {
+            arguments = Bundle("messageType" to Message.TYPE_RECEIVED)
+        } to getString(R.string.messages_tab_received),
+        MessagesListFragment().apply {
+            arguments = Bundle("messageType" to Message.TYPE_SENT)
+        } to getString(R.string.messages_tab_sent),
+        MessagesListFragment().apply {
+            arguments = Bundle("messageType" to Message.TYPE_DELETED)
+        } to getString(R.string.messages_tab_deleted),
+        MessagesListFragment().apply {
+            arguments = Bundle("messageType" to Message.TYPE_DRAFT)
+        } to getString(R.string.messages_tab_draft),
+    )
 
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         val messageId = arguments?.getLong("messageId", -1L) ?: -1L
         if (messageId != -1L) {
             val args = Bundle()
             args.putLong("messageId", messageId)
             arguments?.remove("messageId")
             activity.navigate(navTarget = NavTarget.MESSAGE, args = args)
-            return
         }
 
-        val args = arguments
-
-        val pagerAdapter = FragmentLazyPagerAdapter(
-            fragmentManager = parentFragmentManager,
-            swipeRefreshLayout = b.refreshLayout,
-            fragments = 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),
-
-                MessagesListFragment().apply {
-                    onPageDestroy = this@MessagesFragment.onPageDestroy
-                    arguments = Bundle("messageType" to Message.TYPE_DRAFT)
-                    args?.getBundle("page3")?.let {
-                        arguments?.putAll(it)
-                    }
-                } to getString(R.string.messages_tab_draft),
-            ),
-        )
-        b.viewPager.apply {
-            offscreenPageLimit = 1
-            adapter = pagerAdapter
-            currentItem = pageSelection
-            addOnPageSelectedListener {
-                pageSelection = it
-            }
-            b.tabLayout.setupWithViewPager(this)
-        }
-
-        activity.navView.apply {
-            bottomBar.apply {
-                fabEnable = true
-                fabExtendedText = getString(R.string.compose)
-                fabIcon = CommunityMaterial.Icon3.cmd_pencil_outline
-            }
-
-            bottomSheet.prependItem(
-                BottomSheetPrimaryItem(true)
-                    .withTitle(R.string.menu_messages_config)
-                    .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
-                    .withOnClickListener {
-                        activity.bottomSheet.close()
-                        MessagesConfigDialog(activity, false, null, null).show()
-                    }
-            )
-
-            setFabOnClickListener {
-                activity.navigate(navTarget = NavTarget.MESSAGE_COMPOSE)
-            }
-        }
-
-        activity.gainAttentionFAB()
+        super.onViewReady(savedInstanceState)
     }
 
-    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()
-        }
+    override suspend fun onFabClick() {
+        activity.navigate(navTarget = NavTarget.MESSAGE_COMPOSE)
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesListFragment.kt
index a073351f..0a535cb2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesListFragment.kt
@@ -4,58 +4,42 @@
 
 package pl.szczodrzynski.edziennik.ui.messages.list
 
+import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.coroutines.*
-import pl.szczodrzynski.edziennik.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.enums.NavTarget
 import pl.szczodrzynski.edziennik.databinding.MessagesListFragmentBinding
 import pl.szczodrzynski.edziennik.ext.Bundle
 import pl.szczodrzynski.edziennik.ext.getInt
-import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
-import pl.szczodrzynski.edziennik.data.enums.NavTarget
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
-import kotlin.coroutines.CoroutineContext
 
-class MessagesListFragment : LazyFragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "MessagesListFragment"
-    }
+class MessagesListFragment : BaseFragment<MessagesListFragmentBinding, MainActivity>(
+    inflater = MessagesListFragmentBinding::inflate,
+) {
+
+    override fun getRefreshScrollingView() = b.list
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: MessagesListFragmentBinding
     private lateinit var adapter: MessagesAdapter
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
     private val manager
         get() = app.messageManager
     var teachers = listOf<Teacher>()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = MessagesListFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onPageCreated(): Boolean { startCoroutineTimer(100L) {
+    @SuppressLint("RestrictedApi")
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         val messageType = arguments.getInt("messageType", Message.TYPE_RECEIVED)
         var recyclerViewState =
-            arguments?.getParcelable<LinearLayoutManager.SavedState>("recyclerViewState")
-        val searchText = arguments?.getString("searchText")
+            savedInstanceState?.getParcelable<LinearLayoutManager.SavedState>("recyclerViewState")
+        val searchText = savedInstanceState?.getString("searchText")
 
         teachers = withContext(Dispatchers.Default) {
             app.db.teacherDao().getAllNow(App.profileId)
@@ -91,8 +75,10 @@ class MessagesListFragment : LazyFragment(), CoroutineScope {
                 }
             }
 
+            if (messageType != Message.TYPE_RECEIVED && messageType != Message.TYPE_SENT)
+                canRefreshDisabled = true
+
             // show/hide relevant views
-            setSwipeToRefresh(messageType in Message.TYPE_RECEIVED..Message.TYPE_SENT)
             b.progressBar.isVisible = false
             b.list.isVisible = messages.isNotEmpty()
             b.noData.isVisible = messages.isEmpty()
@@ -109,8 +95,6 @@ class MessagesListFragment : LazyFragment(), CoroutineScope {
                     setHasFixedSize(true)
                     layoutManager = LinearLayoutManager(context)
                     addItemDecoration(SimpleDividerItemDecoration(context))
-                    if (messageType in Message.TYPE_RECEIVED..Message.TYPE_SENT)
-                        addOnScrollListener(onScrollListener)
                     this.adapter = this@MessagesListFragment.adapter
                 }
             }
@@ -126,18 +110,15 @@ class MessagesListFragment : LazyFragment(), CoroutineScope {
                 recyclerViewState = null
             }
         })
-    }; return true }
+    }
 
-    override fun onDestroy() {
-        super.onDestroy()
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
         if (!isAdded || !this::adapter.isInitialized)
             return
         val layoutManager = (b.list.layoutManager as? LinearLayoutManager)
         val searchField = adapter.getSearchField()
-
-        onPageDestroy?.invoke(position, Bundle(
-            "recyclerViewState" to layoutManager?.onSaveInstanceState(),
-            "searchText" to searchField?.searchText?.toString()
-        ))
+        outState.putParcelable("recyclerViewState", layoutManager?.onSaveInstanceState())
+        outState.putString("searchText", searchField?.searchText?.toString())
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/single/MessageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/single/MessageFragment.kt
index 2396f154..6a3c5db9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/single/MessageFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/single/MessageFragment.kt
@@ -5,28 +5,30 @@
 package pl.szczodrzynski.edziennik.ui.messages.single
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import com.mikepenz.iconics.utils.sizeDp
-import kotlinx.coroutines.*
+import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
-import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
-import pl.szczodrzynski.edziennik.data.enums.LoginType
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
-import pl.szczodrzynski.edziennik.databinding.MessageFragmentBinding
-import pl.szczodrzynski.edziennik.ext.*
+import pl.szczodrzynski.edziennik.data.enums.LoginType
 import pl.szczodrzynski.edziennik.data.enums.NavTarget
+import pl.szczodrzynski.edziennik.databinding.MessageFragmentBinding
+import pl.szczodrzynski.edziennik.ext.Bundle
+import pl.szczodrzynski.edziennik.ext.attachToastHint
+import pl.szczodrzynski.edziennik.ext.get
+import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.ext.onClick
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.MessagesConfigDialog
 import pl.szczodrzynski.edziennik.ui.messages.MessagesUtils
 import pl.szczodrzynski.edziennik.ui.messages.list.MessagesFragment
@@ -37,48 +39,27 @@ import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
-import pl.szczodrzynski.navlib.colorAttr
-import kotlin.coroutines.CoroutineContext
 import kotlin.math.min
 
-class MessageFragment : Fragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "MessageFragment"
-    }
+class MessageFragment : BaseFragment<MessageFragmentBinding, MainActivity>(
+    inflater = MessageFragmentBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: MessageFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
+    override fun getBottomSheetItems() = listOf(
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_messages_config)
+            .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                MessagesConfigDialog(activity, false, null, null).show()
+            }
+    )
 
     private val manager
         get() = app.messageManager
     private lateinit var message: MessageFull
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = MessageFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!isAdded) return
-
-        activity.bottomSheet.prependItem(
-            BottomSheetPrimaryItem(true)
-                .withTitle(R.string.menu_messages_config)
-                .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
-                .withOnClickListener {
-                    activity.bottomSheet.close()
-                    MessagesConfigDialog(activity, false, null, null).show()
-                }
-        )
-
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         b.closeButton.onClick { activity.navigateUp() }
 
         // click to expand subject and sender
@@ -88,7 +69,6 @@ class MessageFragment : Fragment(), CoroutineScope {
         b.senderContainer.onClick {
             b.sender.maxLines = if (b.sender.maxLines == 30) 2 else 30
         }
-        // TODO bring back iconics to reply/forward buttons - add modern icons to SzkolnyFont
 
         b.messageStar.onClick {
             launch {
@@ -129,14 +109,12 @@ class MessageFragment : Fragment(), CoroutineScope {
             EdziennikTask.messageGet(App.profileId, message).enqueue(activity)
         }
 
-        launch {
-            message = manager.getMessage(App.profileId, arguments) ?: run {
-                activity.navigateUp()
-                return@launch
-            }
-            b.subject.text = message.subject
-            checkMessage()
+        message = manager.getMessage(App.profileId, arguments) ?: run {
+            activity.navigateUp()
+            return
         }
+        b.subject.text = message.subject
+        checkMessage()
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
@@ -253,17 +231,4 @@ class MessageFragment : Fragment(), CoroutineScope {
             }, owner = message)
         }
     }
-
-    override fun onStart() {
-        EventBus.getDefault().register(this)
-        super.onStart()
-    }
-    override fun onStop() {
-        super.onStop()
-        EventBus.getDefault().unregister(this)
-    }
-    override fun onDestroy() {
-        super.onDestroy()
-        job.cancel()
-    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteDetailsDialog.kt
index 9ec765ec..9a374e9e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteDetailsDialog.kt
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Note
 import pl.szczodrzynski.edziennik.data.db.entity.Noteable
 import pl.szczodrzynski.edziennik.databinding.NoteDetailsDialogBinding
 import pl.szczodrzynski.edziennik.ext.*
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class NoteDetailsDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteEditorDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteEditorDialog.kt
index b26a6158..7388a1de 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteEditorDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteEditorDialog.kt
@@ -21,7 +21,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.NoteEditorDialogBinding
 import pl.szczodrzynski.edziennik.ext.isNotNullNorBlank
 import pl.szczodrzynski.edziennik.ext.resolveString
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.RegistrationConfigDialog
 import pl.szczodrzynski.edziennik.utils.TextInputDropDown
 import pl.szczodrzynski.edziennik.core.manager.TextStylingManager.HtmlMode
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteListDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteListDialog.kt
index 15acc30b..8ce2068c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteListDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteListDialog.kt
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Noteable
 import pl.szczodrzynski.edziennik.databinding.NoteListDialogBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 
 class NoteListDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NotesFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NotesFragment.kt
index 6f2e8688..870a7250 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NotesFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NotesFragment.kt
@@ -5,99 +5,32 @@
 package pl.szczodrzynski.edziennik.ui.notes
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Note
 import pl.szczodrzynski.edziennik.data.db.entity.Noteable
 import pl.szczodrzynski.edziennik.databinding.NotesFragmentBinding
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
-import kotlin.coroutines.CoroutineContext
 
-class NotesFragment : Fragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "NotesFragment"
-    }
+class NotesFragment : BaseFragment<NotesFragmentBinding, MainActivity>(
+    inflater = NotesFragmentBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: NotesFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
+    override fun getFab() =
+        R.string.notes_action_add to CommunityMaterial.Icon3.cmd_text_box_plus_outline
 
     private val manager
         get() = app.noteManager
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? {
-        activity = getActivity() as? MainActivity ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = NotesFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    private fun onNoteClick(note: Note) = launch {
-        val owner = withContext(Dispatchers.IO) {
-            manager.getOwner(note)
-        } as? Noteable
-
-        NoteDetailsDialog(
-            activity = activity,
-            owner = owner,
-            note = note,
-        ).show()
-    }
-
-    private fun onNoteEditClick(note: Note) = launch {
-        val owner = withContext(Dispatchers.IO) {
-            manager.getOwner(note)
-        } as? Noteable
-
-        NoteEditorDialog(
-            activity = activity,
-            owner = owner,
-            editingNote = note,
-            profileId = App.profileId,
-        ).show()
-    }
-
-    private fun onNoteAddClick(view: View?) {
-        NoteEditorDialog(
-            activity = activity,
-            owner = null,
-            editingNote = null,
-            profileId = App.profileId,
-        ).show()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!isAdded) return
-
-        activity.navView.apply {
-            bottomBar.apply {
-                fabEnable = true
-                fabExtendedText = getString(R.string.notes_action_add)
-                fabIcon = CommunityMaterial.Icon3.cmd_text_box_plus_outline
-            }
-
-            setFabOnClickListener(this@NotesFragment::onNoteAddClick)
-        }
-        activity.gainAttentionFAB()
-
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         val adapter = NoteListAdapter(
             activity = activity,
             onNoteClick = this::onNoteClick,
@@ -153,4 +86,38 @@ class NotesFragment : Fragment(), CoroutineScope {
             adapter.getSearchField()?.applyTo(adapter)
         }
     }
+
+    private fun onNoteClick(note: Note) = launch {
+        val owner = withContext(Dispatchers.IO) {
+            manager.getOwner(note)
+        } as? Noteable
+
+        NoteDetailsDialog(
+            activity = activity,
+            owner = owner,
+            note = note,
+        ).show()
+    }
+
+    private fun onNoteEditClick(note: Note) = launch {
+        val owner = withContext(Dispatchers.IO) {
+            manager.getOwner(note)
+        } as? Noteable
+
+        NoteEditorDialog(
+            activity = activity,
+            owner = owner,
+            editingNote = note,
+            profileId = App.profileId,
+        ).show()
+    }
+
+    override suspend fun onFabClick() {
+        NoteEditorDialog(
+            activity = activity,
+            owner = null,
+            editingNote = null,
+            profileId = App.profileId,
+        ).show()
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notifications/NotificationsListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notifications/NotificationsListFragment.kt
index 373ea7de..a5d5182f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notifications/NotificationsListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notifications/NotificationsListFragment.kt
@@ -6,64 +6,45 @@ package pl.szczodrzynski.edziennik.ui.notifications
 
 import android.app.Activity
 import android.content.Intent
-import android.os.AsyncTask
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.*
+import kotlinx.coroutines.launch
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.NotificationsListFragmentBinding
 import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
-import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
-import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import timber.log.Timber
-import kotlin.coroutines.CoroutineContext
 
-class NotificationsListFragment : Fragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "NotificationsListFragment"
-    }
+class NotificationsListFragment : BaseFragment<NotificationsListFragmentBinding, MainActivity>(
+    inflater = NotificationsListFragmentBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: NotificationsListFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = NotificationsListFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { startCoroutineTimer(100L) {
-        if (!isAdded) return@startCoroutineTimer
-
-        activity.bottomSheet.prependItems(
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_remove_notifications)
-                        .withIcon(CommunityMaterial.Icon.cmd_delete_sweep_outline)
-                        .withOnClickListener(View.OnClickListener {
-                            activity.bottomSheet.close()
-                            AsyncTask.execute { app.db.notificationDao().clearAll() }
-                            Toast.makeText(activity, R.string.menu_remove_notifications_success, Toast.LENGTH_SHORT).show()
-                        }))
+    override fun getBottomSheetItems() = listOf(
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_remove_notifications)
+            .withIcon(CommunityMaterial.Icon.cmd_delete_sweep_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                launch(Dispatchers.IO) {
+                    app.db.notificationDao().clearAll()
+                }
+                Toast.makeText(
+                    activity,
+                    R.string.menu_remove_notifications_success,
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+    )
 
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         val adapter = NotificationsAdapter(activity) { notification ->
             val intent = Intent("android.intent.action.MAIN")
             notification.fillIntent(intent)
@@ -100,5 +81,5 @@ class NotificationsListFragment : Fragment(), CoroutineScope {
                 b.noData.isVisible = false
             }
         })
-    }}
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/ProfileManagerFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/ProfileManagerFragment.kt
index baa7c6f3..2d8071f3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/ProfileManagerFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/ProfileManagerFragment.kt
@@ -1,39 +1,14 @@
 package pl.szczodrzynski.edziennik.ui.settings
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.databinding.FragmentProfileManagerBinding
-import pl.szczodrzynski.edziennik.utils.Themes
-
-class ProfileManagerFragment : Fragment() {
-
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: FragmentProfileManagerBinding
-/*
-    private val navController: NavController by lazy { Navigation.findNavController(b.root) }
-*/
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        if (context == null)
-            return null
-        app = activity.application as App
-        // activity, context and profile is valid
-        b = FragmentProfileManagerBinding.inflate(inflater)
-        b.refreshLayout.setParent(activity.swipeRefreshLayout)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (app.profile == null || !isAdded)
-            return
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 
+class ProfileManagerFragment : BaseFragment<FragmentProfileManagerBinding, MainActivity>(
+    inflater = FragmentProfileManagerBinding::inflate,
+) {
 
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsFragment.kt
index fca2b49e..8592ff53 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsFragment.kt
@@ -19,18 +19,11 @@ import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.ui.settings.cards.*
 import kotlin.coroutines.CoroutineContext
 
-class SettingsFragment : MaterialAboutFragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "SettingsFragment"
-    }
+class SettingsFragment : MaterialAboutFragment() {
 
     private lateinit var app: App
     private lateinit var activity: MainActivity
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
     private val util by lazy {
         SettingsUtil(activity) {
             refreshMaterialAboutList()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt
index 42d3c0f6..1d5cb04b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt
@@ -7,7 +7,6 @@ package pl.szczodrzynski.edziennik.ui.settings.cards
 import android.content.Intent
 import android.media.MediaPlayer
 import android.widget.Toast
-import com.danielstone.materialaboutlibrary.items.MaterialAboutItem
 import com.danielstone.materialaboutlibrary.model.MaterialAboutCard
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import eu.szkolny.font.SzkolnyFont
@@ -19,13 +18,14 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.BuildConfig
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
+import pl.szczodrzynski.edziennik.data.enums.NavTarget
 import pl.szczodrzynski.edziennik.ext.after
 import pl.szczodrzynski.edziennik.ext.resolveAttr
 import pl.szczodrzynski.edziennik.ui.dialogs.ChangelogDialog
 import pl.szczodrzynski.edziennik.ui.settings.SettingsCard
 import pl.szczodrzynski.edziennik.ui.settings.SettingsLicenseActivity
 import pl.szczodrzynski.edziennik.ui.settings.SettingsUtil
-import pl.szczodrzynski.edziennik.ui.settings.contributors.ContributorsActivity
+import pl.szczodrzynski.edziennik.ui.settings.contributors.ContributorsFragment
 import pl.szczodrzynski.edziennik.utils.Utils
 import kotlin.coroutines.CoroutineContext
 
@@ -90,7 +90,7 @@ class SettingsAboutCard(util: SettingsUtil) : SettingsCard(util), CoroutineScope
             subText = R.string.settings_about_contributors_subtext,
             icon = CommunityMaterial.Icon.cmd_account_group_outline
         ) {
-            activity.startActivity(Intent(activity, ContributorsActivity::class.java))
+            activity.navigate(navTarget = NavTarget.CONTRIBUTORS)
         },
 
         util.createMoreItem(card, items = listOf(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsActivity.kt
deleted file mode 100644
index 9acbc0b6..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsActivity.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-package pl.szczodrzynski.edziennik.ui.settings.contributors
-
-import android.os.Bundle
-import android.os.Process
-import android.view.KeyEvent
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
-import pl.szczodrzynski.edziennik.data.api.szkolny.response.ContributorsResponse
-import pl.szczodrzynski.edziennik.databinding.ContributorsActivityBinding
-import pl.szczodrzynski.edziennik.ext.Bundle
-import pl.szczodrzynski.edziennik.ext.onClick
-import pl.szczodrzynski.edziennik.ext.onLongClick
-import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
-import pl.szczodrzynski.edziennik.ui.error.ErrorSnackbar
-import kotlin.coroutines.CoroutineContext
-import kotlin.system.exitProcess
-
-class ContributorsActivity : AppCompatActivity(), CoroutineScope {
-    companion object {
-        private const val TAG = "ContributorsActivity"
-        private var contributors: ContributorsResponse? = null
-    }
-
-    private lateinit var app: App
-    private lateinit var b: ContributorsActivityBinding
-
-    private var job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-    private val errorSnackbar: ErrorSnackbar by lazy { ErrorSnackbar(this) }
-
-    private var konami = 0
-
-    override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
-        when (keyCode) {
-            KeyEvent.KEYCODE_DPAD_UP -> konami in 0..1
-            KeyEvent.KEYCODE_DPAD_DOWN -> konami in 2..3
-            KeyEvent.KEYCODE_DPAD_LEFT -> konami in 4..6 step 2
-            KeyEvent.KEYCODE_DPAD_RIGHT -> konami in 5..7 step 2
-            KeyEvent.KEYCODE_B -> konami == 8
-            KeyEvent.KEYCODE_A -> konami == 9
-            else -> false
-        }.let {
-            if (!it) {
-                konami = 0
-                return super.onKeyUp(keyCode, event)
-            }
-            konami++
-            b.konami.isVisible = konami == 10
-            return true
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        app = application as App
-        b = ContributorsActivityBinding.inflate(layoutInflater)
-        setContentView(b.root)
-
-        b.progressBar.isVisible = true
-        b.tabLayout.isVisible = false
-        b.viewPager.isVisible = false
-
-        b.szkolny.onLongClick {
-            if (b.konami.isVisible) {
-                b.glove.isVisible = true
-                b.szkolny.isInvisible = true
-            }
-            true
-        }
-
-        b.glove.onClick {
-            MaterialAlertDialogBuilder(this)
-                .setTitle(R.string.are_you_sure)
-                .setMessage(R.string.dev_mode_enable_warning)
-                .setPositiveButton(R.string.yes) { _, _ ->
-                    app.config.devMode = true
-                    App.devMode = true
-                    MaterialAlertDialogBuilder(this)
-                        .setTitle("Restart")
-                        .setMessage("Wymagany restart aplikacji")
-                        .setPositiveButton(R.string.ok) { _, _ ->
-                            Process.killProcess(Process.myPid())
-                            Runtime.getRuntime().exit(0)
-                            exitProcess(0)
-                        }
-                        .setCancelable(false)
-                        .show()
-                }
-                .setNegativeButton(R.string.no) { _, _ ->
-                    app.config.devMode = false
-                    App.devMode = false
-                    this.finish()
-                }
-                .show()
-        }
-
-        launch {
-            contributors = contributors ?: SzkolnyApi(app).runCatching(errorSnackbar) {
-                getContributors()
-            } ?: return@launch
-
-            val pagerAdapter = FragmentLazyPagerAdapter(
-                supportFragmentManager,
-                fragments = listOf(
-                    ContributorsFragment().apply {
-                        arguments = Bundle(
-                            "items" to contributors!!.contributors.toTypedArray(),
-                            "quantityPluralRes" to R.plurals.contributions_quantity,
-                        )
-                    } to getString(R.string.contributors),
-
-                    ContributorsFragment().apply {
-                        arguments = Bundle(
-                            "items" to contributors!!.translators.toTypedArray(),
-                            "quantityPluralRes" to R.plurals.translations_quantity,
-                        )
-                    } to getString(R.string.translators),
-                )
-            )
-
-            b.viewPager.apply {
-                offscreenPageLimit = 1
-                adapter = pagerAdapter
-                b.tabLayout.setupWithViewPager(this)
-            }
-
-            b.progressBar.isVisible = false
-            b.tabLayout.isVisible = true
-            b.viewPager.isVisible = true
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsFragment.kt
index d378848a..a655460b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsFragment.kt
@@ -1,47 +1,114 @@
 package pl.szczodrzynski.edziennik.ui.settings.contributors
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.os.Process
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.ContributorsResponse
-import pl.szczodrzynski.edziennik.databinding.ContributorsListFragmentBinding
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
-import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
+import pl.szczodrzynski.edziennik.databinding.ContributorsFragmentBinding
+import pl.szczodrzynski.edziennik.ext.Bundle
+import pl.szczodrzynski.edziennik.ext.onClick
+import pl.szczodrzynski.edziennik.ext.onLongClick
+import pl.szczodrzynski.edziennik.ui.base.fragment.PagerFragment
+import kotlin.system.exitProcess
 
-class ContributorsFragment : LazyFragment() {
+class ContributorsFragment : PagerFragment<ContributorsFragmentBinding, MainActivity>(
+    inflater = ContributorsFragmentBinding::inflate,
+) {
     companion object {
-        private const val TAG = "ContributorsFragment"
+        private var contributors: ContributorsResponse? = null
     }
 
-    private lateinit var app: App
-    private lateinit var activity: ContributorsActivity
-    private lateinit var b: ContributorsListFragmentBinding
+    override fun getTabLayout() = b.tabLayout
+    override fun getViewPager() = b.viewPager
+    override suspend fun onCreatePages() = listOf(
+        ContributorsListFragment().apply {
+            arguments = Bundle(
+                "items" to contributors!!.contributors.toTypedArray(),
+                "quantityPluralRes" to R.plurals.contributions_quantity,
+            )
+        } to getString(R.string.contributors),
+        ContributorsListFragment().apply {
+            arguments = Bundle(
+                "items" to contributors!!.translators.toTypedArray(),
+                "quantityPluralRes" to R.plurals.translations_quantity,
+            )
+        } to getString(R.string.translators),
+    )
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as ContributorsActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = ContributorsListFragmentBinding.inflate(inflater)
-        return b.root
-    }
+    /*private var konami = 0
 
-    override fun onPageCreated(): Boolean {
-        val contributorsArray = requireArguments().getParcelableArray("items") as Array<ContributorsResponse.Item>
-        val contributors = contributorsArray.toList()
-        val quantityPluralRes = requireArguments().getInt("quantityPluralRes")
+    override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
+        when (keyCode) {
+            KeyEvent.KEYCODE_DPAD_UP -> konami in 0..1
+            KeyEvent.KEYCODE_DPAD_DOWN -> konami in 2..3
+            KeyEvent.KEYCODE_DPAD_LEFT -> konami in 4..6 step 2
+            KeyEvent.KEYCODE_DPAD_RIGHT -> konami in 5..7 step 2
+            KeyEvent.KEYCODE_B -> konami == 8
+            KeyEvent.KEYCODE_A -> konami == 9
+            else -> false
+        }.let {
+            if (!it) {
+                konami = 0
+                return super.onKeyUp(keyCode, event)
+            }
+            konami++
+            b.konami.isVisible = konami == 10
+            return true
+        }
+    }*/
 
-        val adapter = ContributorsAdapter(activity, contributors, quantityPluralRes)
-        b.list.adapter = adapter
-        b.list.apply {
-            setHasFixedSize(true)
-            layoutManager = LinearLayoutManager(context)
-            addItemDecoration(SimpleDividerItemDecoration(context))
-            addOnScrollListener(onScrollListener)
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
+        b.progressBar.isVisible = true
+        b.tabLayout.isVisible = false
+        b.viewPager.isVisible = false
+
+        b.szkolny.onLongClick {
+            if (b.konami.isVisible) {
+                b.glove.isVisible = true
+                b.szkolny.isInvisible = true
+            }
+            true
         }
 
-        return true
+        b.glove.onClick {
+            MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.are_you_sure)
+                .setMessage(R.string.dev_mode_enable_warning)
+                .setPositiveButton(R.string.yes) { _, _ ->
+                    app.config.devMode = true
+                    App.devMode = true
+                    MaterialAlertDialogBuilder(activity)
+                        .setTitle("Restart")
+                        .setMessage("Wymagany restart aplikacji")
+                        .setPositiveButton(R.string.ok) { _, _ ->
+                            Process.killProcess(Process.myPid())
+                            Runtime.getRuntime().exit(0)
+                            exitProcess(0)
+                        }
+                        .setCancelable(false)
+                        .show()
+                }
+                .setNegativeButton(R.string.no) { _, _ ->
+                    app.config.devMode = false
+                    App.devMode = false
+                }
+                .show()
+        }
+
+        contributors = contributors ?: SzkolnyApi(app).runCatching(activity.errorSnackbar) {
+            getContributors()
+        } ?: return
+
+        b.progressBar.isVisible = false
+        b.tabLayout.isVisible = true
+        b.viewPager.isVisible = true
+
+        super.onViewReady(savedInstanceState)
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsListFragment.kt
new file mode 100644
index 00000000..6ec323d3
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsListFragment.kt
@@ -0,0 +1,28 @@
+package pl.szczodrzynski.edziennik.ui.settings.contributors
+
+import android.os.Bundle
+import androidx.recyclerview.widget.LinearLayoutManager
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.ContributorsResponse
+import pl.szczodrzynski.edziennik.databinding.ContributorsListFragmentBinding
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
+import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
+
+class ContributorsListFragment : BaseFragment<ContributorsListFragmentBinding, MainActivity>(
+    inflater = ContributorsListFragmentBinding::inflate,
+) {
+
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
+        val contributorsArray = requireArguments().getParcelableArray("items") as Array<ContributorsResponse.Item>
+        val contributors = contributorsArray.toList()
+        val quantityPluralRes = requireArguments().getInt("quantityPluralRes")
+
+        val adapter = ContributorsAdapter(activity, contributors, quantityPluralRes)
+        b.list.adapter = adapter
+        b.list.apply {
+            setHasFixedSize(true)
+            layoutManager = LinearLayoutManager(context)
+            addItemDecoration(SimpleDividerItemDecoration(context))
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/teachers/TeachersListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/teachers/TeachersListFragment.kt
index c95b4050..10fd542e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/teachers/TeachersListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/teachers/TeachersListFragment.kt
@@ -5,53 +5,28 @@
 package pl.szczodrzynski.edziennik.ui.teachers
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
-import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.databinding.TeachersListFragmentBinding
 import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
-import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.messages.MessagesUtils
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
-import kotlin.coroutines.CoroutineContext
 
-class TeachersListFragment : Fragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "TeachersListFragment"
-    }
-
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: TeachersListFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = TeachersListFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { startCoroutineTimer(100L) {
-        if (!isAdded) return@startCoroutineTimer
+class TeachersListFragment : BaseFragment<TeachersListFragmentBinding, MainActivity>(
+    inflater = TeachersListFragmentBinding::inflate,
+) {
 
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         val adapter = TeachersAdapter(activity)
 
         adapter.subjectList = withContext(Dispatchers.IO) {
-            App.db.subjectDao().getAllNow(App.profileId)
+            app.db.subjectDao().getAllNow(App.profileId)
         }
 
         app.db.teacherDao().getAllTeachers(App.profileId).observe(viewLifecycleOwner, Observer { items ->
@@ -85,5 +60,5 @@ class TeachersListFragment : Fragment(), CoroutineScope {
                 b.noData.isVisible = false
             }
         })
-    }}
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateDialog.kt
index a1f3b088..38a97f9d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateDialog.kt
@@ -8,9 +8,9 @@ import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.DialogTemplateBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BaseDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.base.ViewDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BaseDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.ViewDialog
 
 /**
  * This class represents a sample dialog using the new style.
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateFragment.kt
index 0e21a080..57bdac0e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateFragment.kt
@@ -4,83 +4,44 @@
 
 package pl.szczodrzynski.edziennik.ui.template
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.databinding.TemplateFragmentBinding
+import pl.szczodrzynski.edziennik.databinding.BasePagerFragmentBinding
 import pl.szczodrzynski.edziennik.ext.Bundle
-import pl.szczodrzynski.edziennik.ext.addOnPageSelectedListener
-import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
+import pl.szczodrzynski.edziennik.ui.base.fragment.PagerFragment
 import pl.szczodrzynski.edziennik.ui.homework.HomeworkDate
 import pl.szczodrzynski.edziennik.ui.homework.HomeworkListFragment
-import kotlin.coroutines.CoroutineContext
 
-class TemplateFragment : Fragment(), CoroutineScope {
+class TemplateFragment : PagerFragment<BasePagerFragmentBinding, MainActivity>(
+    inflater = BasePagerFragmentBinding::inflate,
+) {
     companion object {
-        private const val TAG = "TemplateFragment"
         var pageSelection = 0
     }
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: TemplateFragmentBinding
+    override fun getTabLayout() = b.tabLayout
+    override fun getViewPager() = b.viewPager
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
+    override suspend fun onCreatePages() = listOf(
+        HomeworkListFragment().apply {
+            arguments = Bundle("homeworkDate" to HomeworkDate.CURRENT)
+        } to getString(R.string.homework_tab_current),
 
-    // local/private variables go here
+        HomeworkListFragment().apply {
+            arguments = Bundle("homeworkDate" to HomeworkDate.PAST)
+        } to getString(R.string.homework_tab_past),
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = TemplateFragmentBinding.inflate(inflater)
-        b.refreshLayout.setParent(activity.swipeRefreshLayout)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!isAdded) return
-
-        val pagerAdapter = FragmentLazyPagerAdapter(
-            parentFragmentManager,
-                b.refreshLayout,
-                listOf(
-                        HomeworkListFragment().apply {
-                            arguments = Bundle("homeworkDate" to HomeworkDate.CURRENT)
-                        } to getString(R.string.homework_tab_current),
-
-                        HomeworkListFragment().apply {
-                            arguments = Bundle("homeworkDate" to HomeworkDate.PAST)
-                        } to getString(R.string.homework_tab_past),
-
-                        TemplatePageFragment() to "Pager 0",
-                        TemplatePageFragment() to "Pager 1",
-                        TemplatePageFragment() to "Pager 2",
-                        TemplatePageFragment() to "Pager 3",
-                        TemplateListPageFragment() to "Pager 4",
-                        TemplateListPageFragment() to "Pager 5",
-                        TemplateListPageFragment() to "Pager 6",
-                        TemplateListPageFragment() to "Pager 7"
-                )
-        )
-        b.viewPager.apply {
-            offscreenPageLimit = 1
-            adapter = pagerAdapter
-            currentItem = pageSelection
-            addOnPageSelectedListener {
-                pageSelection = it
-            }
-            b.tabLayout.setupWithViewPager(this)
-        }
-    }
+        TemplatePageFragment() to "Page 0",
+        TemplatePageFragment() to "Page 1",
+        TemplatePageFragment() to "Page 2",
+        TemplatePageFragment() to "Page 3",
+        TemplateListFragment() to "List 4",
+        TemplateListFragment() to "List 5",
+        TemplateListFragment() to "List 6",
+        TemplateListFragment() to "List 7",
+        TemplateListPageFragment() to "ListPage 8",
+        TemplateListPageFragment() to "ListPage 9",
+        TemplateListPageFragment() to "ListPage 10",
+        TemplateListPageFragment() to "ListPage 11"
+    )
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListFragment.kt
index 3bedf547..759bb7fa 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListFragment.kt
@@ -5,54 +5,25 @@
 package pl.szczodrzynski.edziennik.ui.template
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.databinding.TemplateListFragmentBinding
 import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
-import pl.szczodrzynski.edziennik.ext.onScrollListener
-import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
-import kotlin.coroutines.CoroutineContext
 
-class TemplateListFragment : Fragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "TemplateListFragment"
-    }
+class TemplateListFragment : BaseFragment<TemplateListFragmentBinding, MainActivity>(
+    inflater = TemplateListFragmentBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: TemplateListFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = TemplateListFragmentBinding.inflate(inflater)
-        b.refreshLayout.setParent(activity.swipeRefreshLayout)
-        return b.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { startCoroutineTimer(100L) {
-        if (!isAdded) return@startCoroutineTimer
+    override fun getRefreshScrollingView() = b.list
 
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         val adapter = TemplateAdapter(activity)
 
-        app.db.notificationDao().getAll().observe(this@TemplateListFragment, Observer { items ->
+        app.db.notificationDao().getAll().observe(viewLifecycleOwner, Observer { items ->
             if (!isAdded) return@Observer
 
             // load & configure the adapter
@@ -63,11 +34,9 @@ class TemplateListFragment : Fragment(), CoroutineScope {
                     setHasFixedSize(true)
                     layoutManager = LinearLayoutManager(context)
                     addItemDecoration(SimpleDividerItemDecoration(context))
-                    addOnScrollListener(b.refreshLayout.onScrollListener)
                 }
             }
             adapter.notifyDataSetChanged()
-            b.refreshLayout.isEnabled = false // TODO
 
             // show/hide relevant views
             b.progressBar.isVisible = false
@@ -79,5 +48,5 @@ class TemplateListFragment : Fragment(), CoroutineScope {
                 b.noData.isVisible = false
             }
         })
-    }}
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListPageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListPageFragment.kt
index efddb51d..0e9cea85 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListPageFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListPageFragment.kt
@@ -5,48 +5,22 @@
 package pl.szczodrzynski.edziennik.ui.template
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.databinding.TemplateListPageFragmentBinding
 import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
-import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
-import kotlin.coroutines.CoroutineContext
 
-class TemplateListPageFragment : LazyFragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "TemplateListPagerFragment"
-    }
+class TemplateListPageFragment : BaseFragment<TemplateListPageFragmentBinding, MainActivity>(
+    inflater = TemplateListPageFragmentBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: TemplateListPageFragmentBinding
+    override fun getRefreshScrollingView() = b.list
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = TemplateListPageFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onPageCreated(): Boolean { startCoroutineTimer(100L) {
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         val adapter = TemplateAdapter(activity)
 
         app.db.notificationDao().getAll().observe(this@TemplateListPageFragment, Observer { items ->
@@ -60,11 +34,9 @@ class TemplateListPageFragment : LazyFragment(), CoroutineScope {
                     setHasFixedSize(true)
                     layoutManager = LinearLayoutManager(context)
                     addItemDecoration(SimpleDividerItemDecoration(context))
-                    addOnScrollListener(onScrollListener)
                 }
             }
             adapter.notifyDataSetChanged()
-            setSwipeToRefresh(items.isNullOrEmpty())
 
             // show/hide relevant views
             b.progressBar.isVisible = false
@@ -76,5 +48,5 @@ class TemplateListPageFragment : LazyFragment(), CoroutineScope {
                 b.noData.isVisible = false
             }
         })
-    }; return true }
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePageFragment.kt
index 860536ce..3c5eb36c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePageFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePageFragment.kt
@@ -5,47 +5,28 @@
 package pl.szczodrzynski.edziennik.ui.template
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.databinding.TemplatePageFragmentBinding
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
-import kotlin.coroutines.CoroutineContext
+import pl.szczodrzynski.edziennik.ext.getString
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 
-class TemplatePageFragment : LazyFragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "TemplatePagerFragment"
-    }
+class TemplatePageFragment : BaseFragment<TemplatePageFragmentBinding, MainActivity>(
+    inflater = TemplatePageFragmentBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: TemplatePageFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    // local/private variables go here
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = TemplatePageFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    override fun onPageCreated(): Boolean {
-        b.text.text = "Fragment $position"
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
+        b.text.text = "Fragment VIEW READY"
+        b.editText.setText(savedInstanceState.getString("editText", "default"))
 
+        canRefresh = true
         b.button.addOnCheckedChangeListener { button, isChecked ->
-            setSwipeToRefresh(isChecked)
+            canRefresh = isChecked
         }
-        return true
+        b.button.isChecked = canRefresh
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putString("editText", b.editText.text.toString())
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePagerAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePagerAdapter.kt
deleted file mode 100644
index 7cef63ec..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePagerAdapter.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-3-30.
- */
-
-package pl.szczodrzynski.edziennik.ui.template
-
-import androidx.fragment.app.FragmentManager
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyPagerAdapter
-
-class TemplatePagerAdapter(fragmentManager: FragmentManager, swipeRefreshLayout: SwipeRefreshLayout) : LazyPagerAdapter(fragmentManager, swipeRefreshLayout) {
-    override fun getPage(position: Int) = TemplatePageFragment()
-    override fun getPageTitle(position: Int) = "Page $position"
-    override fun getCount() = 10
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/LessonDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/LessonDetailsDialog.kt
index bedcd750..f2f0f33e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/LessonDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/LessonDetailsDialog.kt
@@ -22,7 +22,7 @@ import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
 import pl.szczodrzynski.edziennik.ext.onClick
 import pl.szczodrzynski.edziennik.ext.setText
 import pl.szczodrzynski.edziennik.ui.attendance.AttendanceDetailsDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.base.BindingDialog
+import pl.szczodrzynski.edziennik.ui.base.dialog.BindingDialog
 import pl.szczodrzynski.edziennik.ui.event.EventDetailsDialog
 import pl.szczodrzynski.edziennik.ui.event.EventListAdapter
 import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableDayFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableDayFragment.kt
index 8420c003..299c278a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableDayFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableDayFragment.kt
@@ -6,9 +6,7 @@ package pl.szczodrzynski.edziennik.ui.timetable
 
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.asynclayoutinflater.view.AsyncLayoutInflater
@@ -22,7 +20,6 @@ import com.linkedin.android.tachyon.DayViewConfig
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.utils.colorInt
 import com.mikepenz.iconics.utils.sizeDp
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -30,12 +27,13 @@ import kotlinx.coroutines.withContext
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.core.manager.NoteManager
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.entity.Lesson
-import pl.szczodrzynski.edziennik.data.enums.FeatureType
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.LessonFull
+import pl.szczodrzynski.edziennik.data.enums.FeatureType
 import pl.szczodrzynski.edziennik.databinding.TimetableDayFragmentBinding
 import pl.szczodrzynski.edziennik.databinding.TimetableLessonBinding
 import pl.szczodrzynski.edziennik.databinding.TimetableNoLessonsBinding
@@ -46,7 +44,6 @@ import pl.szczodrzynski.edziennik.ext.asColoredSpannable
 import pl.szczodrzynski.edziennik.ext.asStrikethroughSpannable
 import pl.szczodrzynski.edziennik.ext.concat
 import pl.szczodrzynski.edziennik.ext.dp
-import pl.szczodrzynski.edziennik.ext.findParentById
 import pl.szczodrzynski.edziennik.ext.getStudentData
 import pl.szczodrzynski.edziennik.ext.listOfNotEmpty
 import pl.szczodrzynski.edziennik.ext.onClick
@@ -55,32 +52,22 @@ import pl.szczodrzynski.edziennik.ext.resolveDrawable
 import pl.szczodrzynski.edziennik.ext.setText
 import pl.szczodrzynski.edziennik.ext.setTintColor
 import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.timetable.TimetableFragment.Companion.DEFAULT_END_HOUR
 import pl.szczodrzynski.edziennik.ui.timetable.TimetableFragment.Companion.DEFAULT_START_HOUR
 import pl.szczodrzynski.edziennik.utils.Colors
-import pl.szczodrzynski.edziennik.core.manager.NoteManager
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 import pl.szczodrzynski.edziennik.utils.models.Week
 import pl.szczodrzynski.edziennik.utils.mutableLazy
-import kotlin.coroutines.CoroutineContext
 import kotlin.math.max
 import kotlin.math.min
 
-class TimetableDayFragment : LazyFragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "TimetableDayFragment"
-    }
+class TimetableDayFragment : BaseFragment<TimetableDayFragmentBinding, MainActivity>(
+    inflater = TimetableDayFragmentBinding::inflate,
+) {
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
     private lateinit var inflater: AsyncLayoutInflater
-    private lateinit var b: TimetableDayFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
 
     private var timeIndicatorJob: Job? = null
 
@@ -97,41 +84,32 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
     private val attendanceManager
         get() = app.attendanceManager
 
-    // find SwipeRefreshLayout in the hierarchy
-    private val refreshLayout by lazy { view?.findParentById(R.id.refreshLayout) }
-
     private val dayViewDelegate = mutableLazy {
-        val dayView = DayView(activity, DayViewConfig(
-            startHour = startHour,
-            endHour = endHour,
-            dividerHeight = 1.dp,
-            halfHourHeight = app.data.uiConfig.lessonHeight.dp,
-            hourDividerColor = R.attr.hourDividerColor.resolveAttr(context),
-            halfHourDividerColor = R.attr.halfHourDividerColor.resolveAttr(context),
-            hourLabelWidth = 40.dp,
-            hourLabelMarginEnd = 10.dp,
-            eventMargin = 2.dp
-        ), true)
+        val dayView = DayView(
+            activity, DayViewConfig(
+                startHour = startHour,
+                endHour = endHour,
+                dividerHeight = 1.dp,
+                halfHourHeight = app.data.uiConfig.lessonHeight.dp,
+                hourDividerColor = R.attr.hourDividerColor.resolveAttr(context),
+                halfHourDividerColor = R.attr.halfHourDividerColor.resolveAttr(context),
+                hourLabelWidth = 40.dp,
+                hourLabelMarginEnd = 10.dp,
+                eventMargin = 2.dp
+            ), true
+        )
         dayView.setPadding(10.dp)
         return@mutableLazy dayView
     }
     private val dayView by dayViewDelegate
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         this.inflater = AsyncLayoutInflater(requireContext())
 
         date = arguments?.getInt("date")?.let { Date.fromValue(it) } ?: Date.getToday()
         startHour = arguments?.getInt("startHour") ?: DEFAULT_START_HOUR
         endHour = arguments?.getInt("endHour") ?: DEFAULT_END_HOUR
 
-        b = TimetableDayFragmentBinding.inflate(inflater, null, false)
-        return b.root
-    }
-
-    override fun onPageCreated(): Boolean {
         // observe lesson database
         app.db.timetableDao().getAllForDate(App.profileId, date).observe(this) { lessons ->
             launch {
@@ -148,11 +126,13 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
                 processLessonList(lessons, events, attendanceList)
             }
         }
-
-        return true
     }
 
-    private fun processLessonList(lessons: List<LessonFull>, events: List<EventFull>, attendanceList: List<AttendanceFull>) {
+    private fun processLessonList(
+        lessons: List<LessonFull>,
+        events: List<EventFull>,
+        attendanceList: List<AttendanceFull>,
+    ) {
         // no lessons - timetable not downloaded yet
         if (lessons.isEmpty()) {
             inflater.inflate(R.layout.timetable_no_timetable, b.root) { view, _, _ ->
@@ -165,11 +145,11 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
                 b.noTimetableSync.onClick {
                     it.isEnabled = false
                     EdziennikTask.syncProfile(
-                            profileId = App.profileId,
-                            featureTypes = setOf(FeatureType.TIMETABLE),
-                            arguments = JsonObject(
-                                    "weekStart" to weekStart
-                            )
+                        profileId = App.profileId,
+                        featureTypes = setOf(FeatureType.TIMETABLE),
+                        arguments = JsonObject(
+                            "weekStart" to weekStart
+                        )
                     ).enqueue(activity)
                 }
                 b.noTimetableWeek.setText(R.string.timetable_no_timetable_week, weekStart)
@@ -220,7 +200,8 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
         val lessonsActual = lessons.filter { it.type != Lesson.TYPE_NO_LESSONS }
 
         val minStartHour = lessonsActual.minOf { it.displayStartTime?.hour ?: DEFAULT_END_HOUR }
-        val maxEndHour = lessonsActual.maxOf { it.displayEndTime?.hour?.plus(1) ?: DEFAULT_START_HOUR }
+        val maxEndHour =
+            lessonsActual.maxOf { it.displayEndTime?.hour?.plus(1) ?: DEFAULT_START_HOUR }
 
         if (app.profile.config.ui.timetableTrimHourRange) {
             dayViewDelegate.deinitialize()
@@ -241,7 +222,8 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
         for (i in dayView.startHour..dayView.endHour) {
             if (!isAdded)
                 continue
-            val hourLabelView = layoutInflater.inflate(R.layout.timetable_hour_label, dayView, false) as TextView
+            val hourLabelView =
+                layoutInflater.inflate(R.layout.timetable_hour_label, dayView, false) as TextView
             hourLabelView.text = "$i:00"
             hourLabelViews.add(hourLabelView)
         }
@@ -257,7 +239,11 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
         buildLessonViews(lessonsActual, events, attendanceList)
     }
 
-    private fun buildLessonViews(lessons: List<LessonFull>, events: List<EventFull>, attendanceList: List<AttendanceFull>) {
+    private fun buildLessonViews(
+        lessons: List<LessonFull>,
+        events: List<EventFull>,
+        attendanceList: List<AttendanceFull>,
+    ) {
         if (!isAdded)
             return
 
@@ -309,12 +295,14 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
 
             val eventIcons = listOf(lb.event1, lb.event2, lb.event3)
             if (app.profile.config.ui.timetableShowEvents) {
-                val eventList = events.filter { it.time != null && it.time == lesson.displayStartTime }.take(3)
+                val eventList =
+                    events.filter { it.time != null && it.time == lesson.displayStartTime }.take(3)
                 for ((i, eventIcon) in eventIcons.withIndex()) {
                     eventList.getOrNull(i).let {
                         eventIcon.isVisible = it != null
                         eventIcon.background = it?.let {
-                            R.drawable.bg_circle.resolveDrawable(activity).setTintColor(it.eventColor)
+                            R.drawable.bg_circle.resolveDrawable(activity)
+                                .setTintColor(it.eventColor)
                         }
                     }
                 }
@@ -325,13 +313,15 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
             }
 
 
-            val timeRange = "${startTime.stringHM} - ${endTime.stringHM}".asColoredSpannable(colorSecondary)
+            val timeRange =
+                "${startTime.stringHM} - ${endTime.stringHM}".asColoredSpannable(colorSecondary)
 
             // teacher
-            val teacherInfo = if (lesson.teacherId != null && lesson.teacherId == lesson.oldTeacherId)
-                lesson.teacherName ?: "?"
-            else
-                lesson.teacherName
+            val teacherInfo =
+                if (lesson.teacherId != null && lesson.teacherId == lesson.oldTeacherId)
+                    lesson.teacherName ?: "?"
+                else
+                    lesson.teacherName
                     ?: lesson.oldTeacherName?.asStrikethroughSpannable()
                     ?: ""
 
@@ -340,14 +330,15 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
                 lesson.teamName ?: "?"
             else
                 lesson.teamName
-                    ?: lesson.oldTeamName?.asStrikethroughSpannable()
-                    ?: ""
+                ?: lesson.oldTeamName?.asStrikethroughSpannable()
+                ?: ""
 
             // classroom
-            val classroomInfo = if (lesson.classroom != null && lesson.classroom == lesson.oldClassroom)
-                lesson.classroom ?: "?"
-            else
-                lesson.classroom
+            val classroomInfo =
+                if (lesson.classroom != null && lesson.classroom == lesson.oldClassroom)
+                    lesson.classroom ?: "?"
+                else
+                    lesson.classroom
                     ?: lesson.oldClassroom?.asStrikethroughSpannable()
                     ?: ""
 
@@ -357,7 +348,8 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
                 lesson.getNoteSubstituteText(showNotes = true) ?: lesson.displaySubjectName
 
             val (subjectTextPrimary, subjectTextSecondary) = if (app.profile.config.ui.timetableColorSubjectName) {
-                val subjectColor = lesson.color ?: Colors.stringToMaterialColorCRC(lessonText?.toString() ?: "")
+                val subjectColor =
+                    lesson.color ?: Colors.stringToMaterialColorCRC(lessonText?.toString() ?: "")
                 if (lb.annotationVisible) {
                     lb.subjectContainer.background = ColorDrawable(subjectColor)
                 } else {
@@ -458,6 +450,8 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
 
     override fun onResume() {
         super.onResume()
+        if (!::date.isInitialized)
+            return
         val firstEventTop = (firstEventMinute - dayView.startHour * 60) * dayView.minuteHeight
         b.scrollView.scrollTo(0, firstEventTop.toInt())
         updateTimeIndicator()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableFragment.kt
index b044f0b8..3879a305 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableFragment.kt
@@ -8,25 +8,14 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.os.AsyncTask
-import android.os.Build
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-import androidx.viewpager.widget.ViewPager
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import eu.szkolny.font.SzkolnyFont
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
@@ -34,17 +23,20 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.enums.FeatureType
 import pl.szczodrzynski.edziennik.data.enums.MetadataType
 import pl.szczodrzynski.edziennik.databinding.FragmentTimetableV2Binding
+import pl.szczodrzynski.edziennik.ext.Bundle
 import pl.szczodrzynski.edziennik.ext.JsonObject
 import pl.szczodrzynski.edziennik.ext.getSchoolYearConstrains
 import pl.szczodrzynski.edziennik.ext.getStudentData
+import pl.szczodrzynski.edziennik.ui.base.fragment.PagerFragment
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.TimetableConfigDialog
 import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
 import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Week
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
-import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
-import kotlin.coroutines.CoroutineContext
 
-class TimetableFragment : Fragment(), CoroutineScope {
+class TimetableFragment : PagerFragment<FragmentTimetableV2Binding, MainActivity>(
+    inflater = FragmentTimetableV2Binding::inflate,
+) {
     companion object {
         private const val TAG = "TimetableFragment"
         const val ACTION_SCROLL_TO_DATE = "pl.szczodrzynski.edziennik.timetable.SCROLL_TO_DATE"
@@ -54,27 +46,102 @@ class TimetableFragment : Fragment(), CoroutineScope {
         var pageSelection: Date? = null
     }
 
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: FragmentTimetableV2Binding
+    override fun getFab() = R.string.timetable_today to SzkolnyFont.Icon.szf_calendar_today_outline
+    override fun getMarkAsReadType() = MetadataType.LESSON_CHANGE
+    override fun getBottomSheetItems() = listOf(
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_timetable_sync)
+            .withIcon(CommunityMaterial.Icon.cmd_calendar_sync_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                val date = pageSelection ?: Date.getToday()
+                val weekStart = date.weekStart.stringY_m_d
+                EdziennikTask.syncProfile(
+                    profileId = App.profileId,
+                    featureTypes = setOf(FeatureType.TIMETABLE),
+                    arguments = JsonObject(
+                        "weekStart" to weekStart
+                    )
+                ).enqueue(activity)
+            },
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.timetable_select_day)
+            .withIcon(SzkolnyFont.Icon.szf_calendar_today_outline)
+            .withOnClickListener { _ ->
+                activity.bottomSheet.close()
+                val date = pageSelection ?: Date.getToday()
+                MaterialDatePicker.Builder.datePicker()
+                    .setSelection(date.inMillisUtc)
+                    .setCalendarConstraints(app.profile.getSchoolYearConstrains())
+                    .build()
+                    .apply {
+                        addOnPositiveButtonClickListener { millis ->
+                            val dateSelected = Date.fromMillisUtc(millis)
+                            val index = items.indexOfFirst { it == dateSelected }
+                            if (index != -1)
+                                b.viewPager.setCurrentItem(index, true)
+                        }
+                    }
+                    .show(activity.supportFragmentManager, TAG)
+            },
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_add_event)
+            .withDescription(R.string.menu_add_event_desc)
+            .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                EventManualDialog(
+                    activity,
+                    App.profileId,
+                    defaultDate = items[savedPageSelection]
+                ).show()
+            },
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_generate_block_timetable)
+            .withDescription(R.string.menu_generate_block_timetable_desc)
+            .withIcon(CommunityMaterial.Icon3.cmd_table_large)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                GenerateBlockTimetableDialog(activity)
+            },
+        BottomSheetPrimaryItem(true)
+            .withTitle(R.string.menu_timetable_config)
+            .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
+            .withOnClickListener {
+                activity.bottomSheet.close()
+                TimetableConfigDialog(activity, false, null, null).show()
+            }
+    )
 
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
+    override fun getTabLayout() = b.tabLayout
+    override fun getViewPager() = b.viewPager
 
-    private var fabShown = false
-    private val items = mutableListOf<Date>()
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        b = FragmentTimetableV2Binding.inflate(inflater)
-        // TODO: 2020-01-05 resolve issues with page scrolling (and scrolling up) with viewpager and swipe to refresh
-        //b.refreshLayout.setParent(activity.swipeRefreshLayout)
-        return b.root
+    override fun getPageCount() = items.size
+    override fun getPageFragment(position: Int) = TimetableDayFragment().apply {
+        arguments = Bundle(
+            "date" to items[position].value,
+            "startHour" to startHour,
+            "endHour" to endHour,
+        )
     }
 
+    override fun getPageTitle(position: Int): String {
+        val date = items[position]
+        var pageTitle = Week.getFullDayName(date.weekDay)
+        if (date > weekEnd || date < weekStart) {
+            pageTitle += ", ${date.stringDm}"
+        }
+        return pageTitle
+    }
+
+    private var startHour = DEFAULT_START_HOUR
+    private var endHour = DEFAULT_END_HOUR
+    private val today by lazy { Date.getToday() }
+    private val weekStart by lazy { today.weekStart }
+    private val weekEnd by lazy { weekStart.clone().stepForward(0, 0, 6) }
+    private val items = mutableListOf<Date>()
+    private var fabShown = false
+
     private val broadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, i: Intent) {
             if (!isAdded)
@@ -83,14 +150,16 @@ class TimetableFragment : Fragment(), CoroutineScope {
                 ACTION_SCROLL_TO_DATE -> {
                     val dateStr = i.extras?.getString("timetableDate", null) ?: return
                     val date = Date.fromY_m_d(dateStr)
-                    b.viewPager.setCurrentItem(items.indexOf(date), true)
+                    goToPage(items.indexOf(date))
                 }
+
                 ACTION_RELOAD_PAGES -> {
                     b.viewPager.adapter?.notifyDataSetChanged()
                 }
             }
         }
     }
+
     override fun onResume() {
         super.onResume()
         ContextCompat.registerReceiver(
@@ -106,26 +175,21 @@ class TimetableFragment : Fragment(), CoroutineScope {
             ContextCompat.RECEIVER_NOT_EXPORTED,
         )
     }
+
     override fun onPause() {
         super.onPause()
         activity.unregisterReceiver(broadcastReceiver)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { launch {
-        if (!isAdded)
-            return@launch
-
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         if (app.profile.getStudentData("timetableNotPublic", false)) {
             b.timetableLayout.visibility = View.GONE
             b.timetableNotPublicLayout.visibility = View.VISIBLE
-            return@launch
+            return
         }
         b.timetableLayout.visibility = View.VISIBLE
         b.timetableNotPublicLayout.visibility = View.GONE
 
-        val today = Date.getToday().value
-        var startHour = DEFAULT_START_HOUR
-        var endHour = DEFAULT_END_HOUR
         val deferred = async(Dispatchers.Default) {
             items.clear()
 
@@ -135,7 +199,7 @@ class TimetableFragment : Fragment(), CoroutineScope {
             val yearEnd = app.profile.dateYearEnd
             while (yearStart.value <= yearEnd.value) {
                 items += yearStart.clone()
-                var maxDays = monthDayCount[yearStart.month-1]
+                var maxDays = monthDayCount[yearStart.month - 1]
                 if (yearStart.month == 2 && yearStart.isLeap)
                     maxDays++
                 yearStart.day++
@@ -155,122 +219,26 @@ class TimetableFragment : Fragment(), CoroutineScope {
         }
         deferred.await()
         if (!isAdded)
-            return@launch
+            return
 
-        val pagerAdapter = TimetablePagerAdapter(
-            parentFragmentManager,
-                items,
-                startHour,
-                endHour
-        )
-        b.viewPager.offscreenPageLimit = 1
-        b.viewPager.adapter = pagerAdapter
-        b.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
-            override fun onPageScrollStateChanged(state: Int) {
-                // TODO: 2020-01-05 resolve issues with page scrolling (and scrolling up) with viewpager and swipe to refresh
-                /*if (b.refreshLayout != null) {
-                    b.refreshLayout.isEnabled = state == ViewPager.SCROLL_STATE_IDLE
-                }*/
-            }
+        val selectedDate = arguments?.getString("timetableDate", "")
+            ?.let { if (it.isBlank()) null else Date.fromY_m_d(it) }
+        savedPageSelection = items.indexOfFirst { it == (selectedDate ?: today) }
 
-            override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+        super.onViewReady(savedInstanceState)
+    }
 
-            }
+    override suspend fun onFabClick() {
+        b.viewPager.setCurrentItem(items.indexOfFirst { it == today }, true)
+    }
 
-            override fun onPageSelected(position: Int) {
-                pageSelection = items[position]
-                activity.navView.bottomBar.fabEnable = items[position].value != today
-                if (activity.navView.bottomBar.fabEnable && !fabShown) {
-                    activity.gainAttentionFAB()
-                    fabShown = true
-                }
-                //markLessonsAsSeen()
-            }
-        })
-
-        val selectedDate = arguments?.getString("timetableDate", "")?.let { if (it.isBlank()) null else Date.fromY_m_d(it) }
-
-        // TODO bring back RecyclerTabLayout
-        b.tabLayout.setupWithViewPager(b.viewPager)
-        b.viewPager.setCurrentItem(items.indexOfFirst { it.value == selectedDate?.value ?: today }, false)
-
-        activity.navView.bottomSheet.prependItems(
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_timetable_sync)
-                        .withIcon(CommunityMaterial.Icon.cmd_calendar_sync_outline)
-                        .withOnClickListener {
-                            activity.bottomSheet.close()
-                            val date = pageSelection ?: Date.getToday()
-                            val weekStart = date.weekStart.stringY_m_d
-                            EdziennikTask.syncProfile(
-                                profileId = App.profileId,
-                                featureTypes = setOf(FeatureType.TIMETABLE),
-                                arguments = JsonObject(
-                                    "weekStart" to weekStart
-                                )
-                            ).enqueue(activity)
-                        },
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.timetable_select_day)
-                        .withIcon(SzkolnyFont.Icon.szf_calendar_today_outline)
-                        .withOnClickListener { _ ->
-                            activity.bottomSheet.close()
-                            val date = pageSelection ?: Date.getToday()
-                            MaterialDatePicker.Builder.datePicker()
-                                .setSelection(date.inMillisUtc)
-                                .setCalendarConstraints(app.profile.getSchoolYearConstrains())
-                                .build()
-                                .apply {
-                                    addOnPositiveButtonClickListener { millis ->
-                                        val dateSelected = Date.fromMillisUtc(millis)
-                                        val index = items.indexOfFirst { it == dateSelected }
-                                        if (index != -1)
-                                            b.viewPager.setCurrentItem(index, true)
-                                    }
-                                }
-                                .show(activity.supportFragmentManager, TAG)
-                        },
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_add_event)
-                        .withDescription(R.string.menu_add_event_desc)
-                        .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline)
-                        .withOnClickListener(View.OnClickListener {
-                            activity.bottomSheet.close()
-                            EventManualDialog(activity, App.profileId, defaultDate = pageSelection).show()
-                        }),
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_generate_block_timetable)
-                        .withDescription(R.string.menu_generate_block_timetable_desc)
-                        .withIcon(CommunityMaterial.Icon3.cmd_table_large)
-                        .withOnClickListener(View.OnClickListener {
-                            activity.bottomSheet.close()
-                            GenerateBlockTimetableDialog(activity)
-                        }),
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_timetable_config)
-                        .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
-                        .withOnClickListener {
-                            activity.bottomSheet.close()
-                            TimetableConfigDialog(activity, false, null, null).show()
-                        },
-                BottomSheetSeparatorItem(true),
-                BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_mark_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
-                        .withOnClickListener(View.OnClickListener {
-                            activity.bottomSheet.close()
-                            AsyncTask.execute { app.db.metadataDao().setAllSeen(App.profileId, MetadataType.LESSON_CHANGE, true) }
-                            Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show()
-                        })
-        )
-
-        //activity.navView.bottomBar.fabEnable = true
-        activity.navView.bottomBar.fabExtendedText = getString(R.string.timetable_today)
-        activity.navView.bottomBar.fabIcon = SzkolnyFont.Icon.szf_calendar_today_outline
-        activity.navView.setFabOnClickListener(View.OnClickListener {
-            b.viewPager.setCurrentItem(items.indexOfFirst { it.value == today }, true)
-        })
-    }}
+    override suspend fun onPageSelected(position: Int) {
+        activity.navView.bottomBar.fabEnable = items[position] != today
+        if (activity.navView.bottomBar.fabEnable && !fabShown) {
+            activity.gainAttentionFAB()
+            fabShown = true
+        }
+    }
 
     /*private fun markLessonsAsSeen() = pageSelection?.let { date ->
         app.db.timetableDao().getForDate(App.profileId, date).observeOnce(this@TimetableFragment, Observer { lessons ->
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetablePagerAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetablePagerAdapter.kt
deleted file mode 100644
index 2f1adfd2..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetablePagerAdapter.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2020-1-6
- */
-
-package pl.szczodrzynski.edziennik.ui.timetable
-
-import android.os.Bundle
-import androidx.fragment.app.FragmentManager
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
-import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyPagerAdapter
-import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Week
-
-class TimetablePagerAdapter(
-        fragmentManager: FragmentManager,
-        private val items: List<Date>,
-        private val startHour: Int,
-        private val endHour: Int
-) : LazyPagerAdapter(fragmentManager, null) {
-    companion object {
-        private const val TAG = "TimetablePagerAdapter"
-    }
-
-    private val today by lazy { Date.getToday() }
-    private val weekStart by lazy { today.weekStart }
-    private val weekEnd by lazy { weekStart.clone().stepForward(0, 0, 6) }
-
-    override fun getPage(position: Int): LazyFragment {
-        return TimetableDayFragment().apply {
-            arguments = Bundle().apply {
-                putInt("date", items[position].value)
-                putInt("startHour", startHour)
-                putInt("endHour", endHour)
-            }
-        }
-    }
-
-    override fun getCount(): Int {
-        return items.size
-    }
-
-    override fun getPageTitle(position: Int): CharSequence {
-        val date = items[position]
-        val pageTitle = StringBuilder(Week.getFullDayName(date.weekDay))
-        if (date > weekEnd || date < weekStart) {
-            pageTitle.append(", ").append(date.stringDm)
-        }
-        return pageTitle
-    }
-
-    override fun getItemPosition(`object`: Any): Int {
-        return POSITION_NONE
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/webpush/WebPushFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/webpush/WebPushFragment.kt
index 60403001..5a553003 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/webpush/WebPushFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/webpush/WebPushFragment.kt
@@ -4,39 +4,24 @@
 
 package pl.szczodrzynski.edziennik.ui.webpush
 
-import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.WebPushResponse
 import pl.szczodrzynski.edziennik.databinding.WebPushFragmentBinding
 import pl.szczodrzynski.edziennik.ext.crc32
 import pl.szczodrzynski.edziennik.ext.onClick
+import pl.szczodrzynski.edziennik.ui.base.fragment.BaseFragment
 import pl.szczodrzynski.edziennik.ui.dialogs.QrScannerDialog
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
-import kotlin.coroutines.CoroutineContext
 
-class WebPushFragment : Fragment(), CoroutineScope {
-    companion object {
-        private const val TAG = "TemplateFragment"
-    }
-
-    private lateinit var app: App
-    private lateinit var activity: MainActivity
-    private lateinit var b: WebPushFragmentBinding
-
-    private val job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
+class WebPushFragment : BaseFragment<WebPushFragmentBinding, MainActivity>(
+    inflater = WebPushFragmentBinding::inflate,
+) {
 
     private lateinit var adapter: WebPushBrowserAdapter
     private val api by lazy {
@@ -46,20 +31,7 @@ class WebPushFragment : Fragment(), CoroutineScope {
     private val manager
         get() = app.permissionManager
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity = (getActivity() as MainActivity?) ?: return null
-        context ?: return null
-        app = activity.application as App
-        // activity, context and profile is valid
-        b = WebPushFragmentBinding.inflate(inflater)
-        return b.root
-    }
-
-    @SuppressLint("DefaultLocale")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!isAdded)
-            return
-
+    override suspend fun onViewReady(savedInstanceState: Bundle?) {
         b.scanQrCode.onClick {
             manager.requestCameraPermission(activity, R.string.permissions_qr_scanner) {
                 QrScannerDialog(activity, {
@@ -88,12 +60,10 @@ class WebPushFragment : Fragment(), CoroutineScope {
                 }
         )
 
-        launch {
-            val browsers = api.runCatching(activity.errorSnackbar) {
-                listBrowsers()
-            } ?: return@launch
-            updateBrowserList(browsers)
-        }
+        val browsers = api.runCatching(activity.errorSnackbar) {
+            listBrowsers()
+        } ?: return
+        updateBrowserList(browsers)
     }
 
     private fun updateBrowserList(browsers: List<WebPushResponse.Browser>) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/SwipeRefreshLayoutNoIndicator.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/SwipeRefreshLayoutNoIndicator.java
deleted file mode 100644
index b81123ec..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/SwipeRefreshLayoutNoIndicator.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package pl.szczodrzynski.edziennik.utils;
-
-import android.content.Context;
-import android.os.Build;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-/**
- * The SwipeRefreshLayout should be used whenever the user can refresh the
- * contents of a view via a vertical swipe gesture. The activity that
- * instantiates this view should add an OnRefreshListener to be notified
- * whenever the swipe to refresh gesture is completed. The SwipeRefreshLayout
- * will notify the listener each and every time the gesture is completed again;
- * the listener is responsible for correctly determining when to actually
- * initiate a refresh of its content. If the listener determines there should
- * not be a refresh, it must call setRefreshing(false) to cancel any visual
- * indication of a refresh. If an activity wishes to show just the progress
- * animation, it should call setRefreshing(true). To disable the gesture and
- * progress animation, call setEnabled(false) on the view.
- * <p>
- * This layout should be made the parent of the view that will be refreshed as a
- * result of the gesture and can only support one direct child. This view will
- * also be made the target of the gesture and will be forced to match both the
- * width and the height supplied in this layout. The SwipeRefreshLayout does not
- * provide accessibility events; instead, a menu item must be provided to allow
- * refresh of the content wherever this gesture is used.
- * </p>
- */
-public class SwipeRefreshLayoutNoIndicator extends SwipeRefreshLayout {
-
-    private SwipeRefreshLayoutNoTouch parent;
-
-    @Override
-    public void setEnabled(boolean enabled) {
-        if (parent == null)
-            return;
-        parent.setEnabled(enabled);
-        super.setEnabled(enabled);
-    }
-
-    public void setParent(SwipeRefreshLayoutNoTouch parent) {
-        this.parent = parent;
-    }
-
-    /**
-     * Simple constructor to use when creating a SwipeRefreshLayout from code.
-     *
-     * @param context
-     */
-    public SwipeRefreshLayoutNoIndicator(@NonNull Context context) {
-        this(context, null);
-    }
-
-    /**
-     * Constructor that is called when inflating SwipeRefreshLayout from XML.
-     *
-     * @param context
-     * @param attrs
-     */
-    public SwipeRefreshLayoutNoIndicator(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (Build.VERSION.SDK_INT < 32) {
-            ev.setSource(0x10000000);
-        }
-        boolean parentConsumed = parent.onInterceptTouchEvent(ev);
-        boolean superConsumed = super.onInterceptTouchEvent(ev);
-        return parentConsumed && superConsumed;
-        /*if (super.onInterceptTouchEvent(ev))
-            return parent.onInterceptTouchEvent(ev);
-        return false;*/
-    }
-
-    @Override
-    public void requestDisallowInterceptTouchEvent(boolean b) {
-        parent.requestDisallowInterceptTouchEvent(b);
-    }
-
-    // NestedScrollingParent
-
-    @Override
-    public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {
-        parent.onStartNestedScroll(child, target, nestedScrollAxes);
-        return !parent.isRefreshing() && super.onStartNestedScroll(child, target, nestedScrollAxes);
-    }
-
-    @Override
-    public void onNestedScrollAccepted(View child, View target, int axes) {
-        parent.onNestedScrollAccepted(child, target, axes);
-    }
-
-    @Override
-    public void onNestedPreScroll(View target, int dx, int dy, int[] consumed) {
-        parent.onNestedPreScroll(target, dx, dy, consumed);
-    }
-
-    @Override
-    public int getNestedScrollAxes() {
-        return parent.getNestedScrollAxes();
-    }
-
-    @Override
-    public void onStopNestedScroll(View target) {
-        parent.onStopNestedScroll(target);
-    }
-
-    @Override
-    public void onNestedScroll(final View target, final int dxConsumed, final int dyConsumed,
-                               final int dxUnconsumed, final int dyUnconsumed) {
-        parent.onNestedScroll(target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
-    }
-
-    // NestedScrollingChild
-
-    @Override
-    public void setNestedScrollingEnabled(boolean enabled) {
-        if (parent == null)
-            return;
-        //parent.setNestedScrollingEnabled(enabled);
-        super.setNestedScrollingEnabled(enabled);
-    }
-
-    @Override
-    public boolean isNestedScrollingEnabled() {
-        return parent.isNestedScrollingEnabled();
-    }
-
-    @Override
-    public boolean startNestedScroll(int axes) {
-        return parent.startNestedScroll(axes);
-    }
-
-    @Override
-    public void stopNestedScroll() {
-        parent.stopNestedScroll();
-    }
-
-    @Override
-    public boolean hasNestedScrollingParent() {
-        return parent.hasNestedScrollingParent();
-    }
-
-    @Override
-    public boolean dispatchNestedScroll(int dxConsumed, int dyConsumed, int dxUnconsumed,
-                                        int dyUnconsumed, int[] offsetInWindow) {
-        return super.dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, offsetInWindow);
-    }
-
-    @Override
-    public boolean dispatchNestedPreScroll(int dx, int dy, int[] consumed, int[] offsetInWindow) {
-        return super.dispatchNestedPreScroll(dx, dy, consumed, offsetInWindow);
-    }
-
-    @Override
-    public boolean onNestedPreFling(View target, float velocityX,
-                                    float velocityY) {
-        return parent.onNestedPreFling(target, velocityX, velocityY);
-    }
-
-    @Override
-    public boolean onNestedFling(View target, float velocityX, float velocityY,
-                                 boolean consumed) {
-        return parent.onNestedFling(target, velocityX, velocityY, consumed);
-    }
-
-    @Override
-    public boolean dispatchNestedFling(float velocityX, float velocityY, boolean consumed) {
-        return parent.dispatchNestedFling(velocityX, velocityY, consumed);
-    }
-
-    @Override
-    public boolean dispatchNestedPreFling(float velocityX, float velocityY) {
-        return parent.dispatchNestedPreFling(velocityX, velocityY);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        ev.setSource(0x10000000);
-        /*boolean consumed = super.onTouchEvent(ev);
-        if (consumed) {
-            return false;
-        }*/
-        return parent.onTouchEvent(ev);
-    }
-
-
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/SwipeRefreshLayoutNoTouch.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/SwipeRefreshLayoutNoTouch.java
deleted file mode 100644
index 0b2daf51..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/SwipeRefreshLayoutNoTouch.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package pl.szczodrzynski.edziennik.utils;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-
-public class SwipeRefreshLayoutNoTouch extends SwipeRefreshLayout {
-    public SwipeRefreshLayoutNoTouch(@NonNull Context context) {
-        super(context);
-    }
-
-    public SwipeRefreshLayoutNoTouch(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {
-        return false;
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (ev.getSource() == 0x10000000) {
-            // forward the event to super
-            return super.onInterceptTouchEvent(ev);
-        }
-        // discard all the other events
-        return false;
-
-        /*if (ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_CANCEL)
-            return false;
-        super.onInterceptTouchEvent(ev);
-        return false;*/
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        if (ev.getSource() == 0x10000000) {
-            // forward the event to super
-            return super.onTouchEvent(ev);
-        }
-        // discard all the other events
-        return false;
-    }
-}
diff --git a/app/src/main/res/layout/activity_szkolny.xml b/app/src/main/res/layout/activity_szkolny.xml
index 3c4020ee..ef58e084 100644
--- a/app/src/main/res/layout/activity_szkolny.xml
+++ b/app/src/main/res/layout/activity_szkolny.xml
@@ -15,7 +15,7 @@
             android:layout_height="match_parent"
             android:animateLayoutChanges="true">
 
-            <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -28,7 +28,7 @@
                     <include layout="@layout/fragment_loading" />
                 </FrameLayout>
 
-            </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         </pl.szczodrzynski.navlib.NavView>
     </FrameLayout>
diff --git a/app/src/main/res/layout/attendance_details_dialog.xml b/app/src/main/res/layout/attendance_details_dialog.xml
index 2229f0db..3eceab3c 100644
--- a/app/src/main/res/layout/attendance_details_dialog.xml
+++ b/app/src/main/res/layout/attendance_details_dialog.xml
@@ -161,7 +161,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/attendance_details_lesson_topic"
                 android:textAppearance="?textAppearanceLabelMedium"
-                android:visibility="@{attendance.lessonTopic == null ? View.GONE : View.VISIBLE}" />
+                android:isVisible="@{attendance.lessonTopic != null}" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -169,7 +169,7 @@
                 android:layout_marginTop="0dp"
                 android:text="@{attendance.lessonTopic}"
                 android:textIsSelectable="true"
-                android:visibility="@{attendance.lessonTopic == null ? View.GONE : View.VISIBLE}"
+                android:isVisible="@{attendance.lessonTopic != null}"
                 tools:text="Malowanie autoportretu na ścianie sali gimnastycznej. Modlitwa w terenie." />
 
             <TextView
@@ -192,7 +192,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:baselineAligned="false"
-                android:visibility="@{devMode ? View.VISIBLE : View.GONE}">
+                android:isVisible="@{devMode}">
 
                 <LinearLayout
                     android:layout_width="0dp"
diff --git a/app/src/main/res/layout/attendance_fragment.xml b/app/src/main/res/layout/attendance_fragment.xml
deleted file mode 100644
index 25601c70..00000000
--- a/app/src/main/res/layout/attendance_fragment.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) Kuba Szczodrzyński 2020-4-30.
-  -->
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-        android:id="@+id/refreshLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?colorSurfaceContainerLow"
-                app:tabIndicatorColor="?colorPrimary"
-                app:tabMaxWidth="300dp"
-                app:tabMode="auto"
-                app:tabPaddingBottom="12dp"
-                app:tabPaddingEnd="16dp"
-                app:tabPaddingStart="16dp"
-                app:tabPaddingTop="12dp"
-                app:tabSelectedTextColor="?colorPrimary"
-                app:tabTextAppearance="?textAppearanceBodyMedium"
-                app:tabTextColor="?colorOnBackground" />
-
-            <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
-                android:id="@+id/viewPager"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-        </LinearLayout>
-    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
-</layout>
diff --git a/app/src/main/res/layout/base_pager_fragment.xml b/app/src/main/res/layout/base_pager_fragment.xml
new file mode 100644
index 00000000..7456ae50
--- /dev/null
+++ b/app/src/main/res/layout/base_pager_fragment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) Kuba Szczodrzyński 2024-7-3.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tabLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?colorSurfaceContainerLow"
+        app:tabIndicatorColor="?colorPrimary"
+        app:tabMaxWidth="300dp"
+        app:tabMinWidth="90dp"
+        app:tabMode="auto"
+        app:tabPaddingBottom="12dp"
+        app:tabPaddingEnd="16dp"
+        app:tabPaddingStart="16dp"
+        app:tabPaddingTop="12dp"
+        app:tabSelectedTextColor="?colorPrimary"
+        app:tabTextColor="?android:textColorPrimary" />
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/card_home_events.xml b/app/src/main/res/layout/card_home_events.xml
index f35e28b0..7ea5b989 100644
--- a/app/src/main/res/layout/card_home_events.xml
+++ b/app/src/main/res/layout/card_home_events.xml
@@ -18,7 +18,7 @@
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
-            <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+            <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                 style="?materialIconButtonContainerStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/card_home_grades.xml b/app/src/main/res/layout/card_home_grades.xml
index acc2b18b..4131dad5 100644
--- a/app/src/main/res/layout/card_home_grades.xml
+++ b/app/src/main/res/layout/card_home_grades.xml
@@ -19,7 +19,7 @@
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
-            <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+            <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                 style="?materialIconButtonContainerStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/card_home_lucky_number.xml b/app/src/main/res/layout/card_home_lucky_number.xml
index ab465b35..451af330 100644
--- a/app/src/main/res/layout/card_home_lucky_number.xml
+++ b/app/src/main/res/layout/card_home_lucky_number.xml
@@ -20,7 +20,7 @@
             android:gravity="center_vertical"
             >
 
-            <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+            <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                 android:id="@+id/image"
                 style="?materialIconButtonContainerStyle"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/card_home_notes.xml b/app/src/main/res/layout/card_home_notes.xml
index 7d1a2a12..3dc31240 100644
--- a/app/src/main/res/layout/card_home_notes.xml
+++ b/app/src/main/res/layout/card_home_notes.xml
@@ -16,7 +16,7 @@
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+        <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
             style="?materialIconButtonContainerStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/card_home_timetable.xml b/app/src/main/res/layout/card_home_timetable.xml
index dfdef13a..15247048 100644
--- a/app/src/main/res/layout/card_home_timetable.xml
+++ b/app/src/main/res/layout/card_home_timetable.xml
@@ -22,7 +22,7 @@
             android:visibility="gone"
             tools:visibility="visible">
 
-            <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+            <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                 android:id="@+id/noTimetableSync"
                 style="?materialIconButtonContainerStyle"
                 android:layout_width="wrap_content"
@@ -67,7 +67,7 @@
             tools:layout_marginTop="100dp"
             tools:visibility="visible">
 
-            <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+            <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                 style="?materialIconButtonContainerStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -110,7 +110,7 @@
             tools:layout_marginTop="185dp"
             tools:visibility="visible">
 
-            <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+            <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                 style="?materialIconButtonContainerStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -155,7 +155,7 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+                <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                     style="?materialIconButtonContainerStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/contributors_activity.xml b/app/src/main/res/layout/contributors_fragment.xml
similarity index 97%
rename from app/src/main/res/layout/contributors_activity.xml
rename to app/src/main/res/layout/contributors_fragment.xml
index cc5e5ebd..35ded601 100644
--- a/app/src/main/res/layout/contributors_activity.xml
+++ b/app/src/main/res/layout/contributors_fragment.xml
@@ -17,8 +17,7 @@
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fitsSystemWindows="true">
+            android:layout_height="match_parent">
 
             <ImageView
                 android:id="@+id/konami"
@@ -108,7 +107,7 @@
                 </com.google.android.material.appbar.CollapsingToolbarLayout>
             </com.google.android.material.appbar.AppBarLayout>
 
-            <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
+            <androidx.viewpager2.widget.ViewPager2
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/dialog_config_agenda.xml b/app/src/main/res/layout/dialog_config_agenda.xml
index 11f0c454..0ac03a1d 100644
--- a/app/src/main/res/layout/dialog_config_agenda.xml
+++ b/app/src/main/res/layout/dialog_config_agenda.xml
@@ -93,7 +93,7 @@
                 android:layout_marginHorizontal="32dp"
                 android:text="@string/agenda_config_mode_unavailable"
                 android:textAppearance="?textAppearanceBodySmall"
-                android:visibility="@{isAgendaMode ? View.GONE : View.VISIBLE}" />
+                android:isVisible="@{!isAgendaMode}" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_event_details.xml b/app/src/main/res/layout/dialog_event_details.xml
index d68a20cb..233c0dcf 100644
--- a/app/src/main/res/layout/dialog_event_details.xml
+++ b/app/src/main/res/layout/dialog_event_details.xml
@@ -59,7 +59,7 @@
                         android:text="@{name}"
                         android:textIsSelectable="true"
                         android:textAppearance="?textAppearanceTitleLarge"
-                        android:visibility="@{event.typeName == null ? View.GONE : View.VISIBLE}"
+                        android:isVisible="@{event.typeName != null}"
                         tools:text="sprawdzian" />
 
                     <TextView
@@ -69,7 +69,7 @@
                         android:textIsSelectable="true"
                         android:textAppearance="?textAppearanceTitleMedium"
                         android:text="@{details}"
-                        android:visibility="@{details == null ? View.GONE : View.VISIBLE}"
+                        android:isVisible="@{details != null}"
                         tools:text="język angielski • 2B3T a2"
                         tools:visibility="visible" />
 
@@ -124,14 +124,14 @@
                 android:layout_marginTop="8dp"
                 android:textAppearance="?textAppearanceLabelMedium"
                 android:text="@string/dialog_event_details_teacher"
-                android:visibility="@{event.teacherName != null ? View.VISIBLE : View.GONE}"/>
+                android:isVisible="@{event.teacherName != null}"/>
             <TextView
                 android:id="@+id/teacherName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@{event.teacherName}"
                 android:textIsSelectable="true"
-                android:visibility="@{event.teacherName != null ? View.VISIBLE : View.GONE}"
+                android:isVisible="@{event.teacherName != null}"
                 tools:text="Janósz Kowalski" />
 
             <TextView
@@ -201,7 +201,7 @@
                 android:text="@string/dialog_event_details_attachments"
                 android:textAppearance="?textAppearanceLabelMedium" />
 
-            <pl.szczodrzynski.edziennik.ui.views.AttachmentsView
+            <pl.szczodrzynski.edziennik.ui.base.views.AttachmentsView
                 android:id="@+id/attachmentsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/dialog_event_manual_v2.xml b/app/src/main/res/layout/dialog_event_manual_v2.xml
index b64abeb8..e77a9049 100644
--- a/app/src/main/res/layout/dialog_event_manual_v2.xml
+++ b/app/src/main/res/layout/dialog_event_manual_v2.xml
@@ -26,7 +26,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/dialog_event_manual_date">
-            <pl.szczodrzynski.edziennik.ui.views.DateDropdown
+            <pl.szczodrzynski.edziennik.ui.base.views.DateDropdown
                 android:id="@+id/dateDropdown"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:hint="@string/dialog_event_manual_time">
-            <pl.szczodrzynski.edziennik.ui.views.TimeDropdown
+            <pl.szczodrzynski.edziennik.ui.base.views.TimeDropdown
                 android:id="@+id/timeDropdown"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
             android:layout_marginTop="8dp"
             android:hint="@string/dialog_event_manual_team">
 
-            <pl.szczodrzynski.edziennik.ui.views.TeamDropdown
+            <pl.szczodrzynski.edziennik.ui.base.views.TeamDropdown
                 android:id="@+id/teamDropdown"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
                 android:layout_weight="1"
                 android:hint="@string/dialog_event_manual_type">
 
-                <pl.szczodrzynski.edziennik.ui.views.EventTypeDropdown
+                <pl.szczodrzynski.edziennik.ui.base.views.EventTypeDropdown
                     android:id="@+id/typeDropdown"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -172,7 +172,7 @@
                 android:layout_marginTop="8dp"
                 android:hint="@string/dialog_event_manual_subject">
 
-                <pl.szczodrzynski.edziennik.ui.views.SubjectDropdown
+                <pl.szczodrzynski.edziennik.ui.base.views.SubjectDropdown
                     android:id="@+id/subjectDropdown"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -187,7 +187,7 @@
                 android:layout_marginTop="8dp"
                 android:hint="@string/dialog_event_manual_teacher">
 
-                <pl.szczodrzynski.edziennik.ui.views.TeacherDropdown
+                <pl.szczodrzynski.edziennik.ui.base.views.TeacherDropdown
                     android:id="@+id/teacherDropdown"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_grade_details.xml b/app/src/main/res/layout/dialog_grade_details.xml
index 771fd6a2..be407c43 100644
--- a/app/src/main/res/layout/dialog_grade_details.xml
+++ b/app/src/main/res/layout/dialog_grade_details.xml
@@ -108,7 +108,7 @@
                         android:text="@{weightText}"
                         android:textAppearance="?textAppearanceTitleMedium"
                         android:textIsSelectable="true"
-                        android:visibility="@{weightText != null ? View.VISIBLE : View.GONE}"
+                        android:isVisible="@{weightText != null}"
                         tools:text="waga 3"
                         tools:visibility="visible" />
 
@@ -175,7 +175,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_class_average"
                 android:textAppearance="?textAppearanceLabelMedium"
-                android:visibility="@{grade.classAverage != null &amp;&amp; grade.classAverage != -1 ? View.VISIBLE : View.GONE}" />
+                android:isVisible="@{grade.classAverage != null &amp;&amp; grade.classAverage != -1}" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -183,7 +183,7 @@
                 android:layout_marginTop="0dp"
                 android:text="@{@string/dialog_grade_details_class_average_format(grade.classAverage)}"
                 android:textIsSelectable="true"
-                android:visibility="@{grade.classAverage != null &amp;&amp; grade.classAverage != -1 ? View.VISIBLE : View.GONE}"
+                android:isVisible="@{grade.classAverage != null &amp;&amp; grade.classAverage != -1}"
                 tools:text="1.72" />
 
             <TextView
@@ -192,14 +192,14 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_comment"
                 android:textAppearance="?textAppearanceLabelMedium"
-                android:visibility="@{commentVisible ? View.VISIBLE : View.GONE}" />
+                android:isVisible="@{commentVisible}" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="0dp"
                 android:textIsSelectable="true"
-                android:visibility="@{commentVisible ? View.VISIBLE : View.GONE}"
+                android:isVisible="@{commentVisible}"
                 tools:text="Uczeń jest idiotą i nie umie robić nic w excelu. Niestety nie zdał tej klasy więc ta ocena i tak mu nic nie da, więc a cotam, dam mu jedynkę kolejną.. XDD" />
 
             <TextView
@@ -208,7 +208,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_value"
                 android:textAppearance="?textAppearanceLabelMedium"
-                android:visibility="@{gradeValue != -1 ? View.VISIBLE : View.GONE}" />
+                android:isVisible="@{gradeValue != -1}" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -216,7 +216,7 @@
                 android:layout_marginTop="0dp"
                 android:text="@{@string/dialog_grade_details_class_average_format(gradeValue)}"
                 android:textIsSelectable="true"
-                android:visibility="@{gradeValue != -1 ? View.VISIBLE : View.GONE}"
+                android:isVisible="@{gradeValue != -1}"
                 tools:text="4.75" />
 
             <TextView
@@ -240,7 +240,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_id"
                 android:textAppearance="?textAppearanceLabelMedium"
-                android:visibility="@{devMode ? View.VISIBLE : View.GONE}" />
+                android:isVisible="@{devMode}" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -248,7 +248,7 @@
                 android:layout_marginTop="0dp"
                 android:text="@{Long.toString(grade.id)}"
                 android:textIsSelectable="true"
-                android:visibility="@{devMode ? View.VISIBLE : View.GONE}"
+                android:isVisible="@{devMode}"
                 tools:text="12345" />
 
             <TextView
@@ -257,7 +257,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_improved"
                 android:textAppearance="?textAppearanceBodySmall"
-                android:visibility="@{grade.parentId instanceof Long ? View.VISIBLE : View.GONE}" />
+                android:isVisible="@{grade.parentId instanceof Long}" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -265,7 +265,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_history"
                 android:textAppearance="?textAppearanceTitleMedium"
-                android:visibility="@{historyVisible ? View.VISIBLE : View.GONE}" />
+                android:isVisible="@{historyVisible}" />
 
             <androidx.core.widget.NestedScrollView
                 android:id="@+id/gradeHistoryNest"
@@ -273,7 +273,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:layout_marginHorizontal="-8dp"
-                android:visibility="@{historyVisible ? View.VISIBLE : View.GONE}">
+                android:isVisible="@{historyVisible}">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/gradeHistoryList"
diff --git a/app/src/main/res/layout/dialog_lesson_details.xml b/app/src/main/res/layout/dialog_lesson_details.xml
index 091885f7..b93aeccc 100644
--- a/app/src/main/res/layout/dialog_lesson_details.xml
+++ b/app/src/main/res/layout/dialog_lesson_details.xml
@@ -55,7 +55,7 @@
                         android:textIsSelectable="true"
                         android:textAppearance="?textAppearanceBodyLarge"
                         android:textColor="?android:textColorTertiary"
-                        android:visibility="@{oldSubjectName == null ? View.GONE : View.VISIBLE}"
+                        android:isVisible="@{oldSubjectName != null}"
                         app:strikeThrough="@{true}"
                         tools:text="pracownia urządzeń techniki komputerowej" />
 
@@ -65,7 +65,7 @@
                         android:text="@{subjectName}"
                         android:textIsSelectable="true"
                         android:textAppearance="?textAppearanceTitleLarge"
-                        android:visibility="@{subjectName == null ? View.GONE : View.VISIBLE}"
+                        android:isVisible="@{subjectName != null}"
                         tools:text="pracownia urządzeń techniki komputerowej" />
 
                     <TextView
@@ -81,7 +81,7 @@
                         android:id="@+id/annotation"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:visibility="@{annotationVisible ? View.VISIBLE : View.GONE}"
+                        android:isVisible="@{annotationVisible}"
                         app:chipBackgroundColor="?colorError"
                         android:textColor="?colorOnError"
                         style="?chipStyle"
@@ -102,7 +102,7 @@
                         android:layout_height="wrap_content"
                         android:text="@{lesson.displayLessonNumber.toString()}"
                         android:textAppearance="?textAppearanceHeadlineLarge"
-                        android:visibility="@{lesson.displayLessonNumber == null ? View.GONE : View.VISIBLE}"
+                        android:isVisible="@{lesson.displayLessonNumber != null}"
                         tools:text="4" />
 
                     <TextView
@@ -167,7 +167,7 @@
                     android:layout_marginEnd="8dp"
                     android:layout_marginRight="8dp"
                     android:orientation="vertical"
-                    android:visibility="@{teacherName != null || oldTeacherName != null ? View.VISIBLE : View.GONE}">
+                    android:isVisible="@{teacherName != null || oldTeacherName != null}">
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -181,7 +181,7 @@
                         android:text="@{oldTeacherName}"
                         android:textIsSelectable="true"
                         android:singleLine="true"
-                        android:visibility="@{oldTeacherName != null ? View.VISIBLE : View.GONE}"
+                        android:isVisible="@{oldTeacherName != null}"
                         app:strikeThrough="@{true}"
                         tools:text="Janósz Kowalski" />
                     <TextView
@@ -190,7 +190,7 @@
                         android:layout_height="wrap_content"
                         android:text="@{teacherName}"
                         android:textIsSelectable="true"
-                        android:visibility="@{teacherName != null ? View.VISIBLE : View.GONE}"
+                        android:isVisible="@{teacherName != null}"
                         tools:text="Janósz Kowalski" />
                 </LinearLayout>
 
@@ -199,7 +199,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical"
-                    android:visibility="@{teamName != null || oldTeamName != null ? View.VISIBLE : View.GONE}">
+                    android:isVisible="@{teamName != null || oldTeamName != null}">
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -211,7 +211,7 @@
                         android:textAppearance="?textAppearanceBodySmall"
                         android:text="@{oldTeamName}"
                         android:textIsSelectable="true"
-                        android:visibility="@{oldTeamName != null ? View.VISIBLE : View.GONE}"
+                        android:isVisible="@{oldTeamName != null}"
                         app:strikeThrough="@{true}"
                         tools:text="013 informatyczna" />
                     <TextView
@@ -219,7 +219,7 @@
                         android:layout_height="wrap_content"
                         android:text="@{teamName}"
                         android:textIsSelectable="true"
-                        android:visibility="@{teamName != null ? View.VISIBLE : View.GONE}"
+                        android:isVisible="@{teamName != null}"
                         tools:text="013 informatyczna" />
                 </LinearLayout>
 
@@ -237,7 +237,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical"
-                    android:visibility="@{classroom != null || oldClassroom != null ? View.VISIBLE : View.GONE}">
+                    android:isVisible="@{classroom != null || oldClassroom != null}">
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -250,7 +250,7 @@
                         android:textAppearance="?textAppearanceBodySmall"
                         android:text="@{oldClassroom}"
                         android:textIsSelectable="true"
-                        android:visibility="@{oldClassroom != null ? View.VISIBLE : View.GONE}"
+                        android:isVisible="@{oldClassroom != null}"
                         app:strikeThrough="@{true}"
                         tools:text="013 informatyczna" />
                     <TextView
@@ -258,7 +258,7 @@
                         android:layout_height="wrap_content"
                         android:text="@{classroom}"
                         android:textIsSelectable="true"
-                        android:visibility="@{classroom != null ? View.VISIBLE : View.GONE}"
+                        android:isVisible="@{classroom != null}"
                         tools:text="013 informatyczna" />
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_register_unavailable.xml b/app/src/main/res/layout/dialog_register_unavailable.xml
index 0fb21ded..603d8b3a 100644
--- a/app/src/main/res/layout/dialog_register_unavailable.xml
+++ b/app/src/main/res/layout/dialog_register_unavailable.xml
@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:adjustViewBounds="true"
                 android:scaleType="fitXY"
-                android:visibility="@{message.image != null ? View.VISIBLE : View.GONE}"
+                android:isVisible="@{message.image != null}"
                 tools:src="@tools:sample/backgrounds/scenic" />
 
             <LinearLayout
@@ -64,7 +64,7 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="16dp"
                     android:text="@string/register_unavailable_read_more"
-                    android:visibility="@{message.url != null ? View.VISIBLE : View.GONE}" />
+                    android:isVisible="@{message.url != null}" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/dialog_widget_config.xml b/app/src/main/res/layout/dialog_widget_config.xml
index 2c24a426..1ddf2c00 100644
--- a/app/src/main/res/layout/dialog_widget_config.xml
+++ b/app/src/main/res/layout/dialog_widget_config.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?textAppearanceLabelMedium"
-                android:visibility="@{profileName == null ? View.GONE : View.VISIBLE}"
+                android:isVisible="@{profileName != null}"
                 android:text="@string/dialog_widget_config_profile" />
 
             <TextView
@@ -35,7 +35,7 @@
                 android:layout_marginTop="0dp"
                 android:text="@{profileName}"
                 android:textIsSelectable="true"
-                android:visibility="@{profileName == null ? View.GONE : View.VISIBLE}"
+                android:isVisible="@{profileName != null}"
                 tools:text="Władca Androida" />
 
             <TextView
diff --git a/app/src/main/res/layout/event_list_item.xml b/app/src/main/res/layout/event_list_item.xml
index 1f289b9c..ff3e30e8 100644
--- a/app/src/main/res/layout/event_list_item.xml
+++ b/app/src/main/res/layout/event_list_item.xml
@@ -95,7 +95,7 @@
                 android:ellipsize="middle"
                 android:singleLine="true"
                 android:textAppearance="?textAppearanceBodySmall"
-                android:visibility="@{simpleMode ? View.GONE : View.VISIBLE}"
+                android:isVisible="@{!simpleMode}"
                 tools:text="Udostępniono 10 grudnia przez Ktoś Z Twojej Klasy • 2B3T" />
         </LinearLayout>
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/fragment_announcements.xml b/app/src/main/res/layout/fragment_announcements.xml
index e176614d..382077e9 100644
--- a/app/src/main/res/layout/fragment_announcements.xml
+++ b/app/src/main/res/layout/fragment_announcements.xml
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-            android:id="@+id/refreshLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/announcementsView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        </androidx.recyclerview.widget.RecyclerView>
-        </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
+            android:layout_height="match_parent" />
 
         <TextView
             android:id="@+id/announcementsNoData"
@@ -29,6 +24,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/fragment_behaviour.xml b/app/src/main/res/layout/fragment_behaviour.xml
index b82e05c5..d7d6f3e1 100644
--- a/app/src/main/res/layout/fragment_behaviour.xml
+++ b/app/src/main/res/layout/fragment_behaviour.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-        android:id="@+id/refreshLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
+
         <com.google.android.material.button.MaterialButtonToggleGroup
             android:id="@+id/toggleGroup"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
-            app:singleSelection="true"
+            android:gravity="center_horizontal"
             app:selectionRequired="true"
-            android:gravity="center_horizontal">
+            app:singleSelection="true">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/semester1"
@@ -41,58 +39,66 @@
                 android:layout_height="wrap_content"
                 android:text="Cały rok" />
         </com.google.android.material.button.MaterialButtonToggleGroup>
+
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal">
+            android:gravity="center_horizontal"
+            android:orientation="horizontal">
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?textAppearanceLabelMedium"
-                    android:text="@string/notices_praises_title" />
+                    android:text="@string/notices_praises_title"
+                    android:textAppearance="?textAppearanceLabelMedium" />
+
                 <TextView
                     android:id="@+id/noticesPraisesCount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:text="342525"/>
+                    tools:text="342525" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginHorizontal="32dp">
+                android:layout_marginHorizontal="32dp"
+                android:orientation="vertical">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?textAppearanceLabelMedium"
-                    android:text="@string/notices_warnings_title" />
+                    android:text="@string/notices_warnings_title"
+                    android:textAppearance="?textAppearanceLabelMedium" />
+
                 <TextView
                     android:id="@+id/noticesWarningsCount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:text="53535353"/>
+                    tools:text="53535353" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?textAppearanceLabelMedium"
-                    android:text="@string/notices_other_title" />
+                    android:text="@string/notices_other_title"
+                    android:textAppearance="?textAppearanceLabelMedium" />
+
                 <TextView
                     android:id="@+id/noticesOtherCount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:text="3331"/>
+                    tools:text="3331" />
             </LinearLayout>
         </LinearLayout>
 
@@ -110,29 +116,27 @@
             <LinearLayout
                 android:id="@+id/noticesNoData"
                 android:layout_width="match_parent"
-                android:orientation="vertical"
-                android:gravity="center"
                 android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical"
                 android:visibility="gone"
                 tools:visibility="visible">
 
                 <com.mikepenz.iconics.view.IconicsImageView
                     android:layout_width="match_parent"
                     android:layout_height="92dp"
-                    app:iiv_icon="szf-message-off"
                     app:iiv_color="?android:textColorPrimary"
-                    app:iiv_size="92dp"/>
+                    app:iiv_icon="szf-message-off"
+                    app:iiv_size="92dp" />
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
-                    android:textAppearance="?textAppearanceBodyMedium"
                     android:gravity="center"
-                    android:text="@string/notices_no_data" />
-
+                    android:text="@string/notices_no_data"
+                    android:textAppearance="?textAppearanceBodyMedium" />
             </LinearLayout>
         </FrameLayout>
     </LinearLayout>
-    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
 </layout>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 833ba8e6..44d12959 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,67 +1,60 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) Kuba Szczodrzyński 2019-11-23.
   -->
 
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-        android:id="@+id/refreshLayout"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/scrollView"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:itemCount="1"
+                tools:listitem="@layout/card_home_timetable" />
+
+            <View
+                android:id="@+id/configHintDivider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginVertical="8dp"
+                android:background="?colorOutlineVariant" />
 
             <LinearLayout
+                android:id="@+id/configHint"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/list"
-                    android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    tools:itemCount="1"
-                    tools:listitem="@layout/card_home_timetable" />
-                <View
-                    android:id="@+id/configHintDivider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginVertical="8dp"
-                    android:background="?colorOutlineVariant" />
+                    android:layout_marginHorizontal="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/home_configure_notice"
+                    android:textAppearance="?textAppearanceBodySmall" />
 
-                <LinearLayout
-                    android:id="@+id/configHint"
-                    android:layout_width="match_parent"
+                <Button
+                    android:id="@+id/configureCards"
+                    style="?materialButtonSecondaryStyle"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:layout_marginBottom="16dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="8dp"
-                        android:layout_weight="1"
-                        android:text="@string/home_configure_notice"
-                        android:textAppearance="?textAppearanceBodySmall" />
-
-                    <Button
-                        android:id="@+id/configureCards"
-                        style="?materialButtonSecondaryStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
-                        android:text="@string/home_configure_add_remove" />
-                </LinearLayout>
-
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
+                    android:text="@string/home_configure_add_remove" />
             </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 </layout>
diff --git a/app/src/main/res/layout/fragment_profile_manager.xml b/app/src/main/res/layout/fragment_profile_manager.xml
index e7c7779c..204f2c55 100644
--- a/app/src/main/res/layout/fragment_profile_manager.xml
+++ b/app/src/main/res/layout/fragment_profile_manager.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-        android:id="@+id/refreshLayout"
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <ScrollView
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <LinearLayout
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="@string/hello_blank_fragment" />
-
-            </LinearLayout>
-        </ScrollView>
-    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
-</layout>
\ No newline at end of file
+                android:layout_height="match_parent"
+                android:text="@string/hello_blank_fragment" />
+        </LinearLayout>
+    </ScrollView>
+</layout>
diff --git a/app/src/main/res/layout/fragment_template.xml b/app/src/main/res/layout/fragment_template.xml
index e7c7779c..204f2c55 100644
--- a/app/src/main/res/layout/fragment_template.xml
+++ b/app/src/main/res/layout/fragment_template.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-        android:id="@+id/refreshLayout"
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <ScrollView
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <LinearLayout
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="@string/hello_blank_fragment" />
-
-            </LinearLayout>
-        </ScrollView>
-    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
-</layout>
\ No newline at end of file
+                android:layout_height="match_parent"
+                android:text="@string/hello_blank_fragment" />
+        </LinearLayout>
+    </ScrollView>
+</layout>
diff --git a/app/src/main/res/layout/fragment_timetable_v2.xml b/app/src/main/res/layout/fragment_timetable_v2.xml
index b8e551ed..5f22a3a6 100644
--- a/app/src/main/res/layout/fragment_timetable_v2.xml
+++ b/app/src/main/res/layout/fragment_timetable_v2.xml
@@ -1,93 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <!--<pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-        android:id="@+id/refreshLayout"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">-->
+        android:layout_height="match_parent">
 
-        <FrameLayout
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:id="@+id/timetableLayout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            tools:visibility="gone">
 
-            <androidx.coordinatorlayout.widget.CoordinatorLayout
-                android:id="@+id/timetableLayout"
+            <com.google.android.material.appbar.AppBarLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:visibility="gone">
+                android:layout_height="wrap_content"
+                android:background="?colorSurface">
 
-                <com.google.android.material.appbar.AppBarLayout
+                <com.google.android.material.tabs.TabLayout
+                    android:id="@+id/tabLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?colorSurface">
+                    android:background="?colorSurfaceContainerLow"
+                    app:tabIndicatorColor="?colorPrimary"
+                    app:tabMaxWidth="300dp"
+                    app:tabMinWidth="90dp"
+                    app:tabMode="auto"
+                    app:tabPaddingBottom="12dp"
+                    app:tabPaddingEnd="16dp"
+                    app:tabPaddingStart="16dp"
+                    app:tabPaddingTop="12dp"
+                    app:tabSelectedTextColor="?colorPrimary"
+                    app:tabTextColor="?colorOnBackground" />
+            </com.google.android.material.appbar.AppBarLayout>
 
-                    <com.google.android.material.tabs.TabLayout
-                        android:id="@+id/tabLayout"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="?colorSurfaceContainerLow"
-                        app:tabMode="auto"
-                        app:tabIndicatorColor="?colorPrimary"
-                        app:tabMaxWidth="300dp"
-                        app:tabMinWidth="90dp"
-                        app:tabPaddingBottom="12dp"
-                        app:tabPaddingEnd="16dp"
-                        app:tabPaddingStart="16dp"
-                        app:tabPaddingTop="12dp"
-                        app:tabSelectedTextColor="?colorPrimary"
-                        app:tabTextColor="?colorOnBackground" />
-                </com.google.android.material.appbar.AppBarLayout>
-
-                <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
-                    android:id="@+id/viewPager"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-            </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-            <LinearLayout
-                android:id="@+id/timetableNotPublicLayout"
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+        <LinearLayout
+            android:id="@+id/timetableNotPublicLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/ic_no_timetable" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/timetable_not_public_title"
+                android:textAppearance="?textAppearanceHeadlineSmall" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:layout_marginTop="16dp"
                 android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="gone"
-                tools:visibility="visible">
+                android:text="@string/timetable_not_public_text"
+                android:textAppearance="?textAppearanceBodyLarge" />
 
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_no_timetable" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/timetable_not_public_title"
-                    android:textAppearance="?textAppearanceHeadlineSmall" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="32dp"
-                    android:layout_marginTop="16dp"
-                    android:gravity="center"
-                    android:text="@string/timetable_not_public_text"
-                    android:textAppearance="?textAppearanceBodyLarge" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="32dp"
-                    android:layout_marginTop="16dp"
-                    android:gravity="center"
-                    android:text="@string/timetable_not_public_hint" />
-
-            </LinearLayout>
-
-        </FrameLayout>
-    <!--</pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>-->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:layout_marginTop="16dp"
+                android:gravity="center"
+                android:text="@string/timetable_not_public_hint" />
+        </LinearLayout>
+    </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/grades_list_fragment.xml b/app/src/main/res/layout/grades_list_fragment.xml
index 4180c310..a997719b 100644
--- a/app/src/main/res/layout/grades_list_fragment.xml
+++ b/app/src/main/res/layout/grades_list_fragment.xml
@@ -1,48 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) Kuba Szczodrzyński 2020-3-4.
   -->
 
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-        android:id="@+id/refreshLayout"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <FrameLayout
+        <ProgressBar
+            android:id="@+id/progressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/noData"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:drawablePadding="16dp"
+            android:gravity="center"
+            android:padding="16dp"
+            android:text="@string/grades_no_data"
+            android:textAppearance="?textAppearanceHeadlineSmall"
+            android:visibility="gone"
+            app:drawableTopCompat="@drawable/ic_no_grades"
+            tools:visibility="visible" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/list"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ProgressBar
-                android:id="@+id/progressBar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/noData"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:drawablePadding="16dp"
-                android:gravity="center"
-                android:padding="16dp"
-                android:text="@string/grades_no_data"
-                android:visibility="gone"
-                android:textAppearance="?textAppearanceHeadlineSmall"
-                app:drawableTopCompat="@drawable/ic_no_grades"
-                tools:visibility="visible" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                tools:listitem="@layout/grades_item_subject"
-                tools:visibility="visible" />
-        </FrameLayout>
-    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            tools:listitem="@layout/grades_item_subject"
+            tools:visibility="visible" />
+    </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/homework_fragment.xml b/app/src/main/res/layout/homework_fragment.xml
deleted file mode 100644
index 16f7f5d2..00000000
--- a/app/src/main/res/layout/homework_fragment.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) Kuba Szczodrzyński 2020-3-30.
-  -->
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-        android:id="@+id/refreshLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?colorSurfaceContainerLow"
-                app:tabIndicatorColor="?colorPrimary"
-                app:tabMode="auto"
-                app:tabSelectedTextColor="?colorPrimary"
-                app:tabTextColor="?colorOnBackground" />
-
-            <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
-                android:id="@+id/viewPager"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-        </LinearLayout>
-    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
-</layout>
diff --git a/app/src/main/res/layout/lab_fragment.xml b/app/src/main/res/layout/lab_fragment.xml
index 7453eaea..8966eac7 100644
--- a/app/src/main/res/layout/lab_fragment.xml
+++ b/app/src/main/res/layout/lab_fragment.xml
@@ -14,7 +14,8 @@
             type="pl.szczodrzynski.edziennik.App" />
     </data>
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -201,5 +202,5 @@
                 android:text="Rebuild App.config"
                 android:textAllCaps="false" />
         </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 </layout>
diff --git a/app/src/main/res/layout/lab_playground.xml b/app/src/main/res/layout/lab_playground.xml
index d2fe26c6..0adf37c3 100644
--- a/app/src/main/res/layout/lab_playground.xml
+++ b/app/src/main/res/layout/lab_playground.xml
@@ -2,7 +2,7 @@
   ~ Copyright (c) Kuba Szczodrzyński 2024-6-22.
   -->
 
-<ScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -234,7 +234,7 @@
                     tools:text="Udostępniono 10 grudnia przez Ktoś Z Twojej Klasy • 2B3T" />
             </LinearLayout>
 
-            <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+            <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                 style="?materialIconButtonSecondaryStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -250,7 +250,7 @@
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
-            <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+            <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                 style="?materialIconButtonContainerStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -506,4 +506,4 @@
             </FrameLayout>
         </LinearLayout>
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/login_activity.xml b/app/src/main/res/layout/login_activity.xml
index d8aa5ca4..df5d30c8 100644
--- a/app/src/main/res/layout/login_activity.xml
+++ b/app/src/main/res/layout/login_activity.xml
@@ -19,7 +19,7 @@
             android:orientation="vertical"
             android:visibility="visible">
 
-            <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -31,7 +31,7 @@
                     android:layout_height="match_parent"
                     app:defaultNavHost="false"
                     app:navGraph="@navigation/nav_login" />
-            </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/message_fragment.xml b/app/src/main/res/layout/message_fragment.xml
index a7b0b582..b2ba5a6a 100644
--- a/app/src/main/res/layout/message_fragment.xml
+++ b/app/src/main/res/layout/message_fragment.xml
@@ -172,7 +172,7 @@
                     android:text="Załączniki:"
                     android:textAppearance="?textAppearanceTitleMedium" />
 
-                <pl.szczodrzynski.edziennik.ui.views.AttachmentsView
+                <pl.szczodrzynski.edziennik.ui.base.views.AttachmentsView
                     android:id="@+id/attachmentsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -189,7 +189,7 @@
                     android:visibility="visible"
                     tools:visibility="visible">
 
-                    <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+                    <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                         android:id="@+id/replyButton"
                         style="?materialButtonOutlinedStyle"
                         android:layout_width="0dp"
@@ -204,7 +204,7 @@
                         app:iiv_top_size="24dp"
                         tools:drawableTop="@android:drawable/ic_menu_revert" />
 
-                    <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+                    <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                         android:id="@+id/forwardButton"
                         style="?materialButtonOutlinedStyle"
                         android:layout_width="0dp"
@@ -219,7 +219,7 @@
                         app:iiv_top_size="24dp"
                         tools:drawableTop="@android:drawable/ic_media_ff" />
 
-                    <pl.szczodrzynski.edziennik.ui.views.IconicsMaterialButton
+                    <pl.szczodrzynski.edziennik.ui.base.views.IconicsMaterialButton
                         android:id="@+id/deleteButton"
                         style="?materialButtonOutlinedStyle"
                         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/messages_fragment.xml b/app/src/main/res/layout/messages_fragment.xml
deleted file mode 100644
index be4147e1..00000000
--- a/app/src/main/res/layout/messages_fragment.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) Kuba Szczodrzyński 2020-4-4.
-  -->
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-        android:id="@+id/refreshLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?colorSurfaceContainerLow"
-                app:tabIndicatorColor="?colorPrimary"
-                app:tabMaxWidth="300dp"
-                app:tabMinWidth="90dp"
-                app:tabMode="auto"
-                app:tabPaddingBottom="12dp"
-                app:tabPaddingEnd="16dp"
-                app:tabPaddingStart="16dp"
-                app:tabPaddingTop="12dp"
-                app:tabSelectedTextColor="?colorPrimary"
-                app:tabTextColor="?colorOnBackground" />
-
-            <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
-                android:id="@+id/viewPager"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-        </LinearLayout>
-    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
-</layout>
diff --git a/app/src/main/res/layout/template_fragment.xml b/app/src/main/res/layout/template_fragment.xml
deleted file mode 100644
index c38665b0..00000000
--- a/app/src/main/res/layout/template_fragment.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) Kuba Szczodrzyński 2020-3-30.
-  -->
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-        android:id="@+id/refreshLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?colorSurfaceContainerLow"
-                app:tabIndicatorColor="?colorPrimary"
-                app:tabMode="auto"
-                app:tabSelectedTextColor="?colorPrimary"
-                app:tabTextColor="?android:textColorPrimary" />
-
-            <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
-                android:id="@+id/viewPager"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-        </LinearLayout>
-    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
-</layout>
diff --git a/app/src/main/res/layout/template_list_fragment.xml b/app/src/main/res/layout/template_list_fragment.xml
index c40ca8f9..00d9fe35 100644
--- a/app/src/main/res/layout/template_list_fragment.xml
+++ b/app/src/main/res/layout/template_list_fragment.xml
@@ -1,48 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) Kuba Szczodrzyński 2020-3-30.
   -->
 
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
-        android:id="@+id/refreshLayout"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <FrameLayout
+        <ProgressBar
+            android:id="@+id/progressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/noData"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:drawablePadding="16dp"
+            android:gravity="center"
+            android:padding="16dp"
+            android:text="@string/grades_no_data"
+            android:textAppearance="?textAppearanceHeadlineSmall"
+            android:visibility="gone"
+            app:drawableTopCompat="@drawable/ic_no_grades"
+            tools:visibility="visible" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/list"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ProgressBar
-                android:id="@+id/progressBar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/noData"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:drawablePadding="16dp"
-                android:gravity="center"
-                android:padding="16dp"
-                android:text="@string/grades_no_data"
-                android:textAppearance="?textAppearanceHeadlineSmall"
-                android:visibility="gone"
-                app:drawableTopCompat="@drawable/ic_no_grades"
-                tools:visibility="visible" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                tools:listitem="@layout/grades_item_subject"
-                tools:visibility="visible" />
-        </FrameLayout>
-    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            tools:listitem="@layout/grades_item_subject"
+            tools:visibility="visible" />
+    </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/template_page_fragment.xml b/app/src/main/res/layout/template_page_fragment.xml
index 874c39ee..7f0b4543 100644
--- a/app/src/main/res/layout/template_page_fragment.xml
+++ b/app/src/main/res/layout/template_page_fragment.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) Kuba Szczodrzyński 2020-3-30.
   -->
 
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -18,6 +18,17 @@
             android:gravity="center"
             android:text="Fragment 1" />
 
+        <com.google.android.material.textfield.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/editText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </com.google.android.material.textfield.TextInputLayout>
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/button"
             style="?materialButtonOutlinedStyle"
@@ -25,6 +36,6 @@
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
             android:checkable="true"
-            android:text="Enable/disable Swipe to refresh"/>
+            android:text="Enable/disable Swipe to refresh" />
     </LinearLayout>
 </layout>
diff --git a/app/src/main/res/layout/timetable_lesson.xml b/app/src/main/res/layout/timetable_lesson.xml
index 9b48d8de..50000450 100644
--- a/app/src/main/res/layout/timetable_lesson.xml
+++ b/app/src/main/res/layout/timetable_lesson.xml
@@ -83,7 +83,7 @@
                                 android:layout_gravity="center_vertical"
                                 android:layout_marginHorizontal="8dp"
                                 android:background="@drawable/unread_red_circle"
-                                android:visibility="@{unread ? View.VISIBLE : View.GONE}" />
+                                android:isVisible="@{unread}" />
 
                             <ImageView
                                 android:id="@+id/attendanceIcon"
@@ -103,7 +103,7 @@
                                 android:paddingHorizontal="4dp"
                                 android:text="@{Integer.toString(lessonNumber)}"
                                 android:textAppearance="?textAppearanceTitleLarge"
-                                android:visibility="@{lessonNumber != null ? View.VISIBLE : View.GONE}"
+                                android:isVisible="@{lessonNumber != null}"
                                 tools:text="3" />
                         </LinearLayout>
 
@@ -185,7 +185,7 @@
                         android:textAppearance="?textAppearanceLabelMedium"
                         android:textColor="?colorOnError"
                         android:textAlignment="center"
-                        android:visibility="@{annotationVisible ? View.VISIBLE : View.GONE}"
+                        android:isVisible="@{annotationVisible}"
                         app:chipBackgroundColor="?colorError"
                         app:chipStrokeWidth="0dp"
                         tools:text="@string/timetable_lesson_cancelled" />