Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ALTAPPS-420: Fix step_quiz.domain.model.submissions.Cell serialisation #290

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package org.hyperskill.app.android.core.extensions

import android.os.Bundle
import androidx.fragment.app.Fragment
import com.chrynan.parcelable.core.getParcelable
import com.chrynan.parcelable.core.putParcelable
import kotlinx.serialization.KSerializer
import kotlin.properties.ReadWriteProperty
import kotlin.reflect.KProperty

@Suppress("UnusedReceiverParameter")
fun <T : Any> Fragment.argument(serializer: KSerializer<T>): ReadWriteProperty<Fragment, T> =
FragmentSerializableArgumentDelegate(serializer)

/**
* Delegate to access/write complex objects stored in Fragment.arguments.
*/
class FragmentSerializableArgumentDelegate<T : Any>(serializer: KSerializer<T>) : ReadWriteProperty<Fragment, T> {

private val bundleDelegate = BundleDelegate(serializer)

override operator fun getValue(thisRef: Fragment, property: KProperty<*>): T {
val args = thisRef.arguments ?: throw IllegalStateException("Cannot read property ${property.name} if no arguments have been set")
return bundleDelegate.getValue(args, property)
}
override operator fun setValue(thisRef: Fragment, property: KProperty<*>, value: T) {
val args = thisRef.arguments ?: Bundle().also(thisRef::setArguments)
bundleDelegate.setValue(args, property, value)
}
}

class BundleDelegate<T : Any>(private val serializer: KSerializer<T>) : ReadWriteProperty<Bundle, T> {

private var value: T? = null

override operator fun getValue(thisRef: Bundle, property: KProperty<*>): T {
if (value == null) {
value = thisRef.getParcelable(property.name, deserializer = serializer)
}
return value ?: throw IllegalStateException("Property ${property.name} could not be read")
}
override operator fun setValue(thisRef: Bundle, property: KProperty<*>, value: T) {
val key = property.name
thisRef.putParcelable(key, value, serializer = serializer)
this.value = value
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import by.kirich1409.viewbindingdelegate.viewBinding
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import kotlinx.serialization.builtins.ListSerializer
import org.hyperskill.app.android.R
import org.hyperskill.app.android.core.extensions.argument
import org.hyperskill.app.android.databinding.BottomSheetDialogTableColumnsSelectionBinding
import org.hyperskill.app.android.step_quiz_table.view.adapter.TableColumnMultipleSelectionItemAdapterDelegate
import org.hyperskill.app.android.step_quiz_table.view.adapter.TableColumnSingleSelectionItemAdapterDelegate
Expand Down Expand Up @@ -44,7 +46,7 @@ class TableColumnSelectionBottomSheetDialogFragment : BottomSheetDialogFragment(

private var index: Int by argument()
private var rowTitle: String by argument()
private var chosenColumns: List<Cell> by argument()
private var chosenColumns: List<Cell> by argument(ListSerializer(Cell.serializer()))
private var isCheckBox: Boolean by argument()

private val columnsAdapter = DefaultDelegateAdapter<Cell>()
Expand Down