From e0c5a725246485d417b880bd3e77da6f97d2a938 Mon Sep 17 00:00:00 2001 From: dankito Date: Thu, 13 Aug 2020 14:53:14 +0200 Subject: [PATCH] MOved FlickerCodeStepsCalculator and Bit to BankingUiCommon --- .../banking/ui/android/views/ChipTanFlickerCodeStripeView.kt | 2 +- .../dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt | 2 +- .../ui/javafx/dialogs/tan/controls/ChipTanFlickerCodeView.kt | 2 +- .../src/commonMain/kotlin/net/dankito/banking/ui/util}/Bit.kt | 2 +- .../kotlin/net/dankito/banking/ui/util/FlickerCodeAnimator.kt | 2 -- .../net/dankito/banking/ui/util}/FlickerCodeStepsCalculator.kt | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) rename {fints4k/src/commonMain/kotlin/net/dankito/banking/fints/tan => ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util}/Bit.kt (86%) rename {fints4k/src/commonMain/kotlin/net/dankito/banking/fints/tan => ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util}/FlickerCodeStepsCalculator.kt (98%) diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeStripeView.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeStripeView.kt index 516043af..4d5d18f3 100644 --- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeStripeView.kt +++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeStripeView.kt @@ -4,7 +4,7 @@ import android.content.Context import android.graphics.Color import android.util.AttributeSet import android.view.View -import net.dankito.banking.fints.tan.Bit +import net.dankito.banking.ui.util.Bit open class ChipTanFlickerCodeStripeView @JvmOverloads constructor( diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt index 1c4729a3..40062eeb 100644 --- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt +++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt @@ -11,7 +11,7 @@ import kotlinx.android.synthetic.main.view_tan_image_size_controls.view.* import net.dankito.banking.ui.android.R import net.dankito.banking.ui.model.tan.FlickerCode import net.dankito.banking.ui.util.FlickerCodeAnimator -import net.dankito.banking.fints.tan.Bit +import net.dankito.banking.ui.util.Bit import net.dankito.banking.ui.model.settings.ITanView import net.dankito.banking.ui.model.settings.TanProcedureSettings import net.dankito.utils.android.extensions.asActivity diff --git a/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/controls/ChipTanFlickerCodeView.kt b/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/controls/ChipTanFlickerCodeView.kt index e688d58e..8b9b8d55 100644 --- a/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/controls/ChipTanFlickerCodeView.kt +++ b/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/controls/ChipTanFlickerCodeView.kt @@ -6,7 +6,7 @@ import javafx.geometry.Pos import javafx.scene.paint.Color import net.dankito.banking.ui.model.tan.FlickerCode import net.dankito.banking.ui.util.FlickerCodeAnimator -import net.dankito.banking.fints.tan.Bit +import net.dankito.banking.ui.util.Bit import net.dankito.banking.javafx.dialogs.tan.controls.ChipTanFlickerCodeStripeView import net.dankito.banking.javafx.dialogs.tan.controls.TanGeneratorMarkerView import net.dankito.banking.ui.model.settings.ITanView diff --git a/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/tan/Bit.kt b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util/Bit.kt similarity index 86% rename from fints4k/src/commonMain/kotlin/net/dankito/banking/fints/tan/Bit.kt rename to ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util/Bit.kt index 2a963762..f43aca5e 100644 --- a/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/tan/Bit.kt +++ b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util/Bit.kt @@ -1,4 +1,4 @@ -package net.dankito.banking.fints.tan +package net.dankito.banking.ui.util enum class Bit(val value: Int) { diff --git a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util/FlickerCodeAnimator.kt b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util/FlickerCodeAnimator.kt index 9a3fceb5..75be6aba 100644 --- a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util/FlickerCodeAnimator.kt +++ b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util/FlickerCodeAnimator.kt @@ -2,8 +2,6 @@ package net.dankito.banking.ui.util import kotlinx.coroutines.* import net.dankito.banking.ui.model.tan.FlickerCode -import net.dankito.banking.fints.tan.Bit -import net.dankito.banking.fints.tan.FlickerCodeStepsCalculator import net.dankito.utils.multiplatform.log.LoggerFactory import kotlin.jvm.Volatile diff --git a/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/tan/FlickerCodeStepsCalculator.kt b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util/FlickerCodeStepsCalculator.kt similarity index 98% rename from fints4k/src/commonMain/kotlin/net/dankito/banking/fints/tan/FlickerCodeStepsCalculator.kt rename to ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util/FlickerCodeStepsCalculator.kt index e174edcf..e8b5b495 100644 --- a/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/tan/FlickerCodeStepsCalculator.kt +++ b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/util/FlickerCodeStepsCalculator.kt @@ -1,4 +1,4 @@ -package net.dankito.banking.fints.tan +package net.dankito.banking.ui.util import net.dankito.utils.multiplatform.ObjectHolder