diff --git a/build.gradle b/build.gradle index cad3322e3d..f036709744 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,12 @@ apply plugin: 'maven-publish' apply plugin: 'org.jetbrains.dokka' android { + namespace 'ru.evotor.integrations' + def version = 22 - compileSdkVersion 29 + compileSdkVersion 30 + defaultConfig { minSdkVersion 23 //noinspection ExpiredTargetSdkVersion @@ -18,18 +21,29 @@ android { testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' resValue "integer", "versionCodeIntegrationLibrary", "$version" } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + lintOptions { abortOnError false } + compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + packagingOptions { + exclude 'META-INF/*_module' + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() } } @@ -37,10 +51,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'androidx.annotation:annotation:1.4.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - api 'com.github.evotor:push-notifications:v0.2.1' - api 'com.github.evotor:query-api:1.0.0' + api 'com.github.evotor:query-api:1.2.0' implementation 'com.google.code.gson:gson:2.8.9' @@ -49,19 +61,20 @@ dependencies { repositories { mavenCentral() + maven { url 'https://jitpack.io' } google() } buildscript { - ext.kotlin_version = '1.6.10' + repositories { mavenCentral() google() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.21" + classpath 'com.android.tools.build:gradle:7.3.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10" + classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10" } } // in the individual module build.gradle files @@ -111,7 +124,7 @@ publishing { mavenKotlin(MavenPublication) { groupId 'com.github.evotor' artifactId "integration-library" - version "STDEV-12463" + version "STDEV-13837" artifact(sourceJar) artifact(javadocJar) artifact "${project.buildDir}/outputs/aar/${project.archivesBaseName}-release.aar" @@ -119,7 +132,6 @@ publishing { //generate pom nodes for dependencies pom.withXml { def dependenciesNode = asNode().appendNode('dependencies') - configurations.api.allDependencies.each { dependency -> if (dependency.group) { def dependencyNode = dependenciesNode.appendNode('dependency') diff --git a/gradle.properties b/gradle.properties index 80a49e5679..72cb70da45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -android.enableJetifier=true +android.enableJetifier=false android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6b4ba702ae..23404f46e9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Sep 09 13:53:43 MSK 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml deleted file mode 100644 index 86e4be4f59..0000000000 --- a/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/main/java/ru/evotor/framework/component/viewdata/IntegrationComponentViewDataApi.kt b/src/main/java/ru/evotor/framework/component/viewdata/IntegrationComponentViewDataApi.kt index 559cbc396f..048c500e63 100644 --- a/src/main/java/ru/evotor/framework/component/viewdata/IntegrationComponentViewDataApi.kt +++ b/src/main/java/ru/evotor/framework/component/viewdata/IntegrationComponentViewDataApi.kt @@ -11,7 +11,6 @@ import ru.evotor.framework.component.PaymentPerformer import ru.evotor.framework.core.action.event.receipt.payment.system.event.PaymentSystemEvent import ru.evotor.framework.payment.PaymentSystem import ru.evotor.framework.payment.PaymentType -import ru.evotor.integrations.R object IntegrationComponentViewDataApi { @@ -23,7 +22,8 @@ object IntegrationComponentViewDataApi { val applicationsList = ArrayList() val packageManager = context.packageManager val intent = Intent(eventName) - val applicationsInfo = packageManager.queryIntentServices(intent, PackageManager.GET_META_DATA) + val applicationsInfo = + packageManager.queryIntentServices(intent, PackageManager.GET_META_DATA) for (resolveInfo in applicationsInfo) { generatePaymentPerformerViewData(context, resolveInfo)?.let { applicationsList.add(it) @@ -32,7 +32,10 @@ object IntegrationComponentViewDataApi { return applicationsList } - private fun generatePaymentPerformerViewData(context: Context, resolveInfo: ResolveInfo): PaymentPerformerViewData? { + private fun generatePaymentPerformerViewData( + context: Context, + resolveInfo: ResolveInfo + ): PaymentPerformerViewData? { if (resolveInfo.serviceInfo == null || resolveInfo.serviceInfo.metaData == null) { return null } @@ -42,12 +45,16 @@ object IntegrationComponentViewDataApi { val packageManager = context.packageManager var appUuid: String? = null try { - val packageInfo = packageManager.getPackageInfo(resolveInfo.serviceInfo.packageName, PackageManager.GET_META_DATA or PackageManager.GET_PERMISSIONS) + val packageInfo = packageManager.getPackageInfo( + resolveInfo.serviceInfo.packageName, + PackageManager.GET_META_DATA or PackageManager.GET_PERMISSIONS + ) if (!hasPermission(packageInfo)) { return null } if (packageInfo.applicationInfo.metaData != null) { - appUuid = packageInfo.applicationInfo.metaData.getString(METADATA_NAME_APP_UUID, null) + appUuid = + packageInfo.applicationInfo.metaData.getString(METADATA_NAME_APP_UUID, null) } } catch (exc: PackageManager.NameNotFoundException) { return null @@ -56,36 +63,40 @@ object IntegrationComponentViewDataApi { return null } val paymentSystem = PaymentSystem( - paymentType, - resolveInfo.loadLabel(packageManager).toString(), - paymentSystemId + paymentType, + resolveInfo.loadLabel(packageManager).toString(), + paymentSystemId ) val paymentPerformer = PaymentPerformer( - paymentSystem, - resolveInfo.serviceInfo.packageName, - resolveInfo.serviceInfo.name, - appUuid, - resolveInfo.loadLabel(packageManager).toString() + paymentSystem, + resolveInfo.serviceInfo.packageName, + resolveInfo.serviceInfo.name, + appUuid, + resolveInfo.loadLabel(packageManager).toString() ) - val backgroundColor = if (metaData.containsKey(BACKGROUND_COLOR_KEY)) + val backgroundColor = if (metaData.containsKey(BACKGROUND_COLOR_KEY)) { metaData.getInt(BACKGROUND_COLOR_KEY) - else - context.getColor(R.color.white) + } else { + context.getColor(android.R.color.white) + } + return PaymentPerformerViewData( - paymentPerformer, - resolveInfo.loadIcon(packageManager), - backgroundColor, - ColorUtils.getContrastColor(backgroundColor) + paymentPerformer, + resolveInfo.loadIcon(packageManager), + backgroundColor, + ColorUtils.getContrastColor(backgroundColor) ) } - private fun hasPermission(packageInfo: PackageInfo) = packageInfo.requestedPermissions.contains(PaymentSystemEvent.NAME_PERMISSION) + private fun hasPermission(packageInfo: PackageInfo) = + packageInfo.requestedPermissions.contains(PaymentSystemEvent.NAME_PERMISSION) - private fun getPaymentSystemId(metaData: Bundle) = metaData.getString(PaymentSystemEvent.META_NAME_PAYMENT_SYSTEM_ID, null) + private fun getPaymentSystemId(metaData: Bundle) = + metaData.getString(PaymentSystemEvent.META_NAME_PAYMENT_SYSTEM_ID, null) private fun getPaymentType(metaData: Bundle) = try { PaymentType.valueOf(metaData.getString(PaymentSystemEvent.META_NAME_PAYMENT_TYPE, null)) } catch (t: Throwable) { null } -} \ No newline at end of file +} diff --git a/src/main/java/ru/evotor/framework/inventory/ProductQuery.kt b/src/main/java/ru/evotor/framework/inventory/ProductQuery.kt index e35b73be86..97301901d4 100644 --- a/src/main/java/ru/evotor/framework/inventory/ProductQuery.kt +++ b/src/main/java/ru/evotor/framework/inventory/ProductQuery.kt @@ -8,82 +8,113 @@ import java.math.BigDecimal /** * Created by a.lunkov on 07.03.2018. */ -class ProductQuery : FilterBuilder(ProductTable.URI) { +class ProductQuery : + FilterBuilder(ProductTable.URI) { @JvmField val uuid = addFieldFilter(ProductTable.ROW_UUID) + @JvmField val parentUuid = addFieldFilter(ProductTable.ROW_PARENT_UUID) + @JvmField val code = addFieldFilter(ProductTable.ROW_CODE) + @JvmField val name = addFieldFilter(ProductTable.ROW_NAME) + @JvmField val taxNumber = addFieldFilter(ProductTable.ROW_TAX_NUMBER) + @JvmField val type = addFieldFilter(ProductTable.ROW_TYPE) + @JvmField - val price = addFieldFilter(ProductTable.ROW_PRICE_OUT, {it.multiply(BigDecimal(100))}) + val price = addFieldFilter( + ProductTable.ROW_PRICE_OUT + ) { it.multiply(BigDecimal(100)) } + @JvmField - val costPrice = addFieldFilter(ProductTable.ROW_COST_PRICE, {it?.multiply(BigDecimal(100))}) + val costPrice = addFieldFilter( + ProductTable.ROW_COST_PRICE + ) { it?.multiply(BigDecimal(100)) } + @JvmField - val quantity = addFieldFilter(ProductTable.ROW_QUANTITY, {it.multiply(BigDecimal(1000))}) + val quantity = addFieldFilter( + ProductTable.ROW_QUANTITY + ) { it.multiply(BigDecimal(1000)) } + @JvmField val description = addFieldFilter(ProductTable.ROW_DESCRIPTION) + @JvmField val measureName = addFieldFilter(ProductTable.ROW_MEASURE_NAME) + @JvmField val measurePrecision = addFieldFilter(ProductTable.ROW_MEASURE_PRECISION) + @JvmField - val alcoholByVolume = addFieldFilter(ProductTable.ROW_ALCOHOL_BY_VOLUME, {it?.multiply(BigDecimal(1000))}) + val alcoholByVolume = addFieldFilter( + ProductTable.ROW_ALCOHOL_BY_VOLUME + ) { it?.multiply(BigDecimal(1000)) } + @JvmField val alcoholProductKindCode = addFieldFilter(ProductTable.ROW_ALCOHOL_PRODUCT_KIND_CODE) - @JvmField - val tareVolume = addFieldFilter(ProductTable.ROW_TARE_VOLUME, {it?.multiply(BigDecimal(1000))}) - override val currentQuery: ProductQuery - get() = this + @JvmField + val tareVolume = addFieldFilter( + ProductTable.ROW_TARE_VOLUME + ) { it?.multiply(BigDecimal(1000)) } class SortOrder : FilterBuilder.SortOrder() { @JvmField val uuid = addFieldSorter(ProductTable.ROW_UUID) + @JvmField val parentUuid = addFieldSorter(ProductTable.ROW_PARENT_UUID) + @JvmField val code = addFieldSorter(ProductTable.ROW_CODE) + @JvmField val name = addFieldSorter(ProductTable.ROW_NAME) + @JvmField val taxNumber = addFieldSorter(ProductTable.ROW_TAX_NUMBER) + @JvmField val type = addFieldSorter(ProductTable.ROW_TYPE) + @JvmField val price = addFieldSorter(ProductTable.ROW_PRICE_OUT) + @JvmField val costPrice = addFieldSorter(ProductTable.ROW_COST_PRICE) + @JvmField val quantity = addFieldSorter(ProductTable.ROW_QUANTITY) + @JvmField val description = addFieldSorter(ProductTable.ROW_DESCRIPTION) + @JvmField val measureName = addFieldSorter(ProductTable.ROW_MEASURE_NAME) + @JvmField val measurePrecision = addFieldSorter(ProductTable.ROW_MEASURE_PRECISION) + @JvmField val alcoholByVolume = addFieldSorter(ProductTable.ROW_ALCOHOL_BY_VOLUME) + @JvmField val alcoholProductKindCode = addFieldSorter(ProductTable.ROW_ALCOHOL_PRODUCT_KIND_CODE) + @JvmField val tareVolume = addFieldSorter(ProductTable.ROW_TARE_VOLUME) - - override val currentSortOrder: SortOrder - get() = this - } override fun getValue(cursor: Cursor): ProductItem? { return ProductMapper.getValueFromCursor(cursor) } - } diff --git a/src/main/java/ru/evotor/framework/receipt/FiscalReceipt.kt b/src/main/java/ru/evotor/framework/receipt/FiscalReceipt.kt index deda9dd7c0..f0229e44f9 100644 --- a/src/main/java/ru/evotor/framework/receipt/FiscalReceipt.kt +++ b/src/main/java/ru/evotor/framework/receipt/FiscalReceipt.kt @@ -3,8 +3,8 @@ package ru.evotor.framework.receipt import android.os.Bundle import ru.evotor.IBundlable import ru.evotor.framework.FiscalDocument -import ru.evotor.framework.kkt.FiscalRequisite import ru.evotor.framework.FutureFeature +import ru.evotor.framework.kkt.FiscalRequisite import ru.evotor.framework.kkt.FiscalTags import ru.evotor.framework.provider.FiscalDocumentContract import ru.evotor.framework.receipt.mapper.FiscalReceiptMapper @@ -14,52 +14,52 @@ import ru.evotor.query.FilterBuilder import java.util.* data class FiscalReceipt internal constructor( - /** - * Номер фискального документа - */ - @FiscalRequisite(tag = FiscalTags.DOCUMENT_NUMBER) - override val documentNumber: Long, + /** + * Номер фискального документа + */ + @FiscalRequisite(tag = FiscalTags.DOCUMENT_NUMBER) + override val documentNumber: Long, - /** - * Дата и время создания фискального документа - */ - @FiscalRequisite(tag = FiscalTags.CREATION_DATE) - override val creationDate: Date, + /** + * Дата и время создания фискального документа + */ + @FiscalRequisite(tag = FiscalTags.CREATION_DATE) + override val creationDate: Date, - /** - * Признак (тип) расчёта - */ - @FiscalRequisite(tag = FiscalTags.SETTLEMENT_TYPE) - val settlementType: SettlementType, + /** + * Признак (тип) расчёта + */ + @FiscalRequisite(tag = FiscalTags.SETTLEMENT_TYPE) + val settlementType: SettlementType, - /** - * Регистрационный номер ККТ - */ - @FiscalRequisite(tag = FiscalTags.KKT_REGISTRATION_NUMBER) - override val kktRegistrationNumber: Long, + /** + * Регистрационный номер ККТ + */ + @FiscalRequisite(tag = FiscalTags.KKT_REGISTRATION_NUMBER) + override val kktRegistrationNumber: Long, - /** - * Номер аппаратной смены - */ - @FiscalRequisite(tag = FiscalTags.SESSION_NUMBER) - override val sessionNumber: Long, + /** + * Номер аппаратной смены + */ + @FiscalRequisite(tag = FiscalTags.SESSION_NUMBER) + override val sessionNumber: Long, - /** - * Номер фискального накопителя - */ - @FiscalRequisite(tag = FiscalTags.FISCAL_STORAGE_NUMBER) - override val fiscalStorageNumber: Long, + /** + * Номер фискального накопителя + */ + @FiscalRequisite(tag = FiscalTags.FISCAL_STORAGE_NUMBER) + override val fiscalStorageNumber: Long, - /** - * Фискальный признак (фискальный идентификатор) документа - */ - @FiscalRequisite(tag = FiscalTags.FISCAL_IDENTIFIER) - override val fiscalIdentifier: Long, + /** + * Фискальный признак (фискальный идентификатор) документа + */ + @FiscalRequisite(tag = FiscalTags.FISCAL_IDENTIFIER) + override val fiscalIdentifier: Long, - /** - * Был ли напечатан фискальный чек - */ - val wasPrinted: Boolean + /** + * Был ли напечатан фискальный чек + */ + val wasPrinted: Boolean ) : FiscalDocument(), IBundlable { companion object { fun from(bundle: Bundle?): FiscalReceipt? = FiscalReceiptMapper.read(bundle) @@ -68,31 +68,33 @@ data class FiscalReceipt internal constructor( override fun toBundle(): Bundle = FiscalReceiptMapper.write(this) @FutureFeature("Query на получение фискальных чеков") - private class Query : FilterBuilder(FiscalReceiptContract.URI) { + private class Query : + FilterBuilder(FiscalReceiptContract.URI) { val documentNumber = addFieldFilter(FiscalDocumentContract.COLUMN_DOCUMENT_NUMBER) val creationDate = addFieldFilter(FiscalDocumentContract.COLUMN_CREATION_DATE) - val settlementType = addFieldFilter(FiscalReceiptContract.COLUMN_SETTLEMENT_TYPE) - val kktRegistrationNumber = addFieldFilter(FiscalDocumentContract.COLUMN_KKT_REGISTRATION_NUMBER) + val settlementType = + addFieldFilter(FiscalReceiptContract.COLUMN_SETTLEMENT_TYPE) + val kktRegistrationNumber = + addFieldFilter(FiscalDocumentContract.COLUMN_KKT_REGISTRATION_NUMBER) val sessionNumber = addFieldFilter(FiscalDocumentContract.COLUMN_SESSION_NUMBER) - val fiscalStorageNumber = addFieldFilter(FiscalDocumentContract.COLUMN_FISCAL_STORAGE_NUMBER) + val fiscalStorageNumber = + addFieldFilter(FiscalDocumentContract.COLUMN_FISCAL_STORAGE_NUMBER) val fiscalIdentifier = addFieldFilter(FiscalDocumentContract.COLUMN_FISCAL_IDENTIFIER) class SortOrder : FilterBuilder.SortOrder() { val documentNumber = addFieldSorter(FiscalDocumentContract.COLUMN_DOCUMENT_NUMBER) val creationDate = addFieldSorter(FiscalDocumentContract.COLUMN_CREATION_DATE) val settlementType = addFieldSorter(FiscalReceiptContract.COLUMN_SETTLEMENT_TYPE) - val kktRegistrationNumber = addFieldSorter(FiscalDocumentContract.COLUMN_KKT_REGISTRATION_NUMBER) + val kktRegistrationNumber = + addFieldSorter(FiscalDocumentContract.COLUMN_KKT_REGISTRATION_NUMBER) val sessionNumber = addFieldSorter(FiscalDocumentContract.COLUMN_SESSION_NUMBER) - val fiscalStorageNumber = addFieldSorter(FiscalDocumentContract.COLUMN_FISCAL_STORAGE_NUMBER) + val fiscalStorageNumber = + addFieldSorter(FiscalDocumentContract.COLUMN_FISCAL_STORAGE_NUMBER) val fiscalIdentifier = addFieldSorter(FiscalDocumentContract.COLUMN_FISCAL_IDENTIFIER) - - override val currentSortOrder: SortOrder - get() = this } - override val currentQuery: Query - get() = this - - override fun getValue(cursor: Cursor): FiscalReceipt = FiscalReceiptMapper.read(cursor) + override fun getValue(cursor: Cursor): FiscalReceipt { + return FiscalReceiptMapper.read(cursor) + } } -} \ No newline at end of file +} diff --git a/src/main/java/ru/evotor/framework/receipt/MedicineAttribute.kt b/src/main/java/ru/evotor/framework/receipt/MedicineAttribute.kt index d2c67881d6..0454ae094e 100644 --- a/src/main/java/ru/evotor/framework/receipt/MedicineAttribute.kt +++ b/src/main/java/ru/evotor/framework/receipt/MedicineAttribute.kt @@ -120,4 +120,4 @@ data class MedicineAttribute( } } -} \ No newline at end of file +} diff --git a/src/main/java/ru/evotor/framework/users/GrantQuery.kt b/src/main/java/ru/evotor/framework/users/GrantQuery.kt index 847e7b1b6f..574a1b55fd 100644 --- a/src/main/java/ru/evotor/framework/users/GrantQuery.kt +++ b/src/main/java/ru/evotor/framework/users/GrantQuery.kt @@ -3,27 +3,25 @@ package ru.evotor.framework.users import ru.evotor.query.Cursor import ru.evotor.query.FilterBuilder -class GrantQuery(authenticatedUsersOnly: Boolean = false) : FilterBuilder( - if (authenticatedUsersOnly) GrantsTable.URI_GRANTS_OF_AUTHENTICATED_USER else GrantsTable.URI) { +class GrantQuery(authenticatedUsersOnly: Boolean = false) : + FilterBuilder( + if (authenticatedUsersOnly) GrantsTable.URI_GRANTS_OF_AUTHENTICATED_USER else GrantsTable.URI + ) { @JvmField val title = addFieldFilter(GrantsTable.ROW_TITLE) + @JvmField val roleUuid = addFieldFilter(GrantsTable.ROW_ROLE_UUID) - override val currentQuery: GrantQuery - get() = this - class SortOrder : FilterBuilder.SortOrder() { @JvmField val title = addFieldSorter(GrantsTable.ROW_TITLE) + @JvmField val roleUuid = addFieldSorter(GrantsTable.ROW_ROLE_UUID) - override val currentSortOrder: SortOrder - get() = this - } override fun getValue(cursor: Cursor): Grant? { diff --git a/src/main/java/ru/evotor/framework/users/UserQuery.kt b/src/main/java/ru/evotor/framework/users/UserQuery.kt index 293984dc49..2485949ed7 100644 --- a/src/main/java/ru/evotor/framework/users/UserQuery.kt +++ b/src/main/java/ru/evotor/framework/users/UserQuery.kt @@ -3,56 +3,67 @@ package ru.evotor.framework.users import ru.evotor.query.Cursor import ru.evotor.query.FilterBuilder -class UserQuery(authenticatedUsersOnly: Boolean = false): - FilterBuilder( - if (authenticatedUsersOnly) UsersTable.URI_AUTHENTICATED else UsersTable.URI - ) { +class UserQuery(authenticatedUsersOnly: Boolean = false) : + FilterBuilder( + if (authenticatedUsersOnly) UsersTable.URI_AUTHENTICATED else UsersTable.URI + ) { @JvmField val uuid = addFieldFilter(UsersTable.ROW_USER_UUID) + @JvmField val secondName = addFieldFilter(UsersTable.ROW_USER_SECOND_NAME) + @JvmField val firstName = addFieldFilter(UsersTable.ROW_USER_FIRST_NAME) + @JvmField val inn = addFieldFilter(UsersTable.ROW_USER_INN) + @JvmField val phone = addFieldFilter(UsersTable.ROW_USER_PHONE) + @JvmField val pin = addFieldFilter(UsersTable.ROW_USER_PIN) + @JvmField val roleUuid = addFieldFilter(UsersTable.ROW_ROLE_UUID) + @JvmField val roleTitle = addFieldFilter(UsersTable.ROW_ROLE_TITLE) + @JvmField val position = addFieldFilter(UsersTable.ROW_USER_POSITION) - override val currentQuery: UserQuery - get() = this - class SortOrder : FilterBuilder.SortOrder() { @JvmField val uuid = addFieldSorter(UsersTable.ROW_USER_UUID) + @JvmField val secondName = addFieldSorter(UsersTable.ROW_USER_SECOND_NAME) + @JvmField val firstName = addFieldSorter(UsersTable.ROW_USER_FIRST_NAME) + @JvmField val inn = addFieldSorter(UsersTable.ROW_USER_INN) + @JvmField val phone = addFieldSorter(UsersTable.ROW_USER_PHONE) + @JvmField val pin = addFieldSorter(UsersTable.ROW_USER_PIN) + @JvmField val roleUuid = addFieldSorter(UsersTable.ROW_ROLE_UUID) + @JvmField val roleTitle = addFieldSorter(UsersTable.ROW_ROLE_TITLE) + @JvmField val position = addFieldSorter(UsersTable.ROW_USER_POSITION) - override val currentSortOrder: SortOrder - get() = this } override fun getValue(cursor: Cursor): User? { diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml deleted file mode 100644 index 9f4c36e1d5..0000000000 --- a/src/main/res/values/colors.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - #FFFFFF - #333333 - \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml deleted file mode 100644 index a669f6e732..0000000000 --- a/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - integration-library -