1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00

lib updates + disabled jettifier (#967)

This commit is contained in:
Evgenii Kozlov 2020-10-09 15:16:39 +03:00 committed by GitHub
parent e556b82c6c
commit 8a2d01c0db
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 42 deletions

View file

@ -36,16 +36,17 @@ class DatabaseViewFragment : ViewStateFragment<ViewState<Table>>(R.layout.fragme
override fun render(state: ViewState<Table>) {
when (state) {
is ViewState.Init -> {
tableView.adapter =
tableView.setAdapter(
TableAdapter(
requireContext()
)
)
vm.getDatabaseView(id = TEST_ID)
}
is ViewState.Success -> {
tableView.adapter.setColumnHeaderItems(state.data.column)
tableView.adapter.setCellItems(state.data.cell)
tableView.adapter?.setColumnHeaderItems(state.data.column)
tableView.adapter?.setCellItems(state.data.cell)
}
}
}

View file

@ -15,7 +15,7 @@ import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder
const val VIEW_TYPE_DEFAULT = 0
class TableAdapter(context: Context) :
AbstractTableAdapter<ColumnView, RowView, CellView>(context) {
AbstractTableAdapter<ColumnView, RowView, CellView>() {
// -------------- Cell --------------------
@ -77,14 +77,6 @@ class TableAdapter(context: Context) :
}
}
override fun onBindCellViewHolder(
holder: AbstractViewHolder?,
cellItemModel: Any?,
columnPosition: Int,
rowPosition: Int
) {
}
// -------------- Column --------------------
override fun getColumnHeaderItemViewType(position: Int): Int =
@ -161,35 +153,11 @@ class TableAdapter(context: Context) :
}
}
override fun onBindColumnHeaderViewHolder(
holder: AbstractViewHolder?,
columnHeaderItemModel: Any?,
columnPosition: Int
) {
}
// -------------- Row --------------------
override fun getRowHeaderItemViewType(position: Int): Int =
VIEW_TYPE_DEFAULT
override fun onBindRowHeaderViewHolder(
holder: AbstractViewHolder?,
rowHeaderItemModel: Any?,
rowPosition: Int
) = Unit
override fun onCreateRowHeaderViewHolder(
parent: ViewGroup?,
viewType: Int
): AbstractViewHolder {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun onCreateCornerView(): View {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
companion object {
val VIEW_TYPE_TITLE = 1
@ -206,6 +174,39 @@ class TableAdapter(context: Context) :
val VIEW_TYPE_PHONE = 12
val VIEW_TYPE_NEW = 13
}
override fun onBindCellViewHolder(
holder: AbstractViewHolder,
cellItemModel: CellView?,
columnPosition: Int,
rowPosition: Int
) {
TODO("Not yet implemented")
}
override fun onBindColumnHeaderViewHolder(
holder: AbstractViewHolder,
columnHeaderItemModel: ColumnView?,
columnPosition: Int
) {
TODO("Not yet implemented")
}
override fun onBindRowHeaderViewHolder(
holder: AbstractViewHolder,
rowHeaderItemModel: RowView?,
rowPosition: Int
) {
TODO("Not yet implemented")
}
override fun onCreateRowHeaderViewHolder(parent: ViewGroup, viewType: Int): AbstractViewHolder {
TODO("Not yet implemented")
}
override fun onCreateCornerView(parent: ViewGroup): View {
TODO("Not yet implemented")
}
}
fun LayoutInflater.toView(id: Int, parent: ViewGroup): View = this.inflate(id, parent, false)

View file

@ -1,7 +1,7 @@
apply from: './dependencies.gradle'
buildscript {
ext.kotlin_version = '1.4.0'
ext.kotlin_version = '1.4.10'
ext.gradle_tools = '3.1.3'
ext.build_tools = '29.0.0'
ext.nav_version = '2.3.0'
@ -28,9 +28,9 @@ buildscript {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.gms:google-services:4.3.4'
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.12"
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}"
}
}

View file

@ -16,7 +16,7 @@ ext {
androidx_core_testing_version = '2.1.0'
appcompat_version = '1.1.0'
constraintLayout_version = '2.0.0'
recyclerview_version = '1.2.0-alpha05'
recyclerview_version = '1.2.0-alpha06'
cardview_version = '1.0.0'
material_version = '1.1.0-beta02'
fragment_version = "1.2.5"
@ -41,7 +41,7 @@ ext {
gson_version = '2.8.6'
rxrelay_version = '2.1.0'
better_link_method_version = '2.2.0'
table_view_version = '0.8.8'
table_view_version = '0.8.9.2'
rxbinding_version = '3.0.0'
permission_disp_version = '4.6.0'
pickt_version = "0.1.11"

View file

@ -17,7 +17,7 @@ org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true
android.enableR8=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.enableJetifier=false
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.enableUnitTestBinaryResources=true