diff --git a/bank/src/main/java/de/solarisbank/identhub/bank/feature/iban/VerificationBankIbanFragment.kt b/bank/src/main/java/de/solarisbank/identhub/bank/feature/iban/VerificationBankIbanFragment.kt index 5f2603f..3ea6ba1 100644 --- a/bank/src/main/java/de/solarisbank/identhub/bank/feature/iban/VerificationBankIbanFragment.kt +++ b/bank/src/main/java/de/solarisbank/identhub/bank/feature/iban/VerificationBankIbanFragment.kt @@ -12,7 +12,7 @@ import android.widget.* import androidx.core.view.isVisible import de.solarisbank.identhub.bank.BankFlow import de.solarisbank.identhub.bank.R -import de.solarisbank.identhub.R as coreR +import de.solarisbank.sdk.R as CoreR import de.solarisbank.identhub.bank.data.ErrorState import de.solarisbank.identhub.bank.feature.VerificationBankViewModel import de.solarisbank.identhub.session.main.BaseFragment @@ -256,9 +256,9 @@ sealed class SealedVerificationState : VerificationState { override val isProgressBarShown = false override val ibanInputErrorLabelVisibility = View.INVISIBLE override val isSubmitButtonEnabled = false - override val dialogTitleId = coreR.string.identhub_generic_error_title - override val dialogMessageId = coreR.string.identhub_generic_error_message - override val dialogPositiveLabelId = coreR.string.identhub_ok_button + override val dialogTitleId = CoreR.string.identhub_generic_error_title + override val dialogMessageId = CoreR.string.identhub_generic_error_message + override val dialogPositiveLabelId = CoreR.string.identhub_ok_button override val dialogNegativeLabelId = null } @@ -271,7 +271,7 @@ sealed class SealedVerificationState : VerificationState { override val isSubmitButtonEnabled = false override val dialogTitleId = R.string.identhub_iban_verification_invalid_iban_title override val dialogMessageId = R.string.identhub_iban_verification_invalid_iban_message - override val dialogPositiveLabelId = coreR.string.identhub_ok_button + override val dialogPositiveLabelId = CoreR.string.identhub_ok_button override val dialogNegativeLabelId = R.string.identhub_iban_verification_retry_button } @@ -283,7 +283,7 @@ sealed class SealedVerificationState : VerificationState { override val isSubmitButtonEnabled = false override val dialogTitleId = R.string.identhub_iban_verification_already_identified_title override val dialogMessageId = R.string.identhub_iban_verification_already_identified_title - override val dialogPositiveLabelId = coreR.string.identhub_ok_button + override val dialogPositiveLabelId = CoreR.string.identhub_ok_button override val dialogNegativeLabelId = null } @@ -295,7 +295,7 @@ sealed class SealedVerificationState : VerificationState { override val isSubmitButtonEnabled = false override val dialogTitleId = R.string.identhub_iban_verification_excess_attempts_title override val dialogMessageId = R.string.identhub_iban_verification_excess_attempts_message - override val dialogPositiveLabelId = coreR.string.identhub_ok_button + override val dialogPositiveLabelId = CoreR.string.identhub_ok_button override val dialogNegativeLabelId = null } } \ No newline at end of file diff --git a/bank/src/main/java/de/solarisbank/identhub/bank/feature/processing/ProcessingVerificationFragment.kt b/bank/src/main/java/de/solarisbank/identhub/bank/feature/processing/ProcessingVerificationFragment.kt index 89d63f8..6b39139 100644 --- a/bank/src/main/java/de/solarisbank/identhub/bank/feature/processing/ProcessingVerificationFragment.kt +++ b/bank/src/main/java/de/solarisbank/identhub/bank/feature/processing/ProcessingVerificationFragment.kt @@ -3,7 +3,7 @@ package de.solarisbank.identhub.bank.feature.processing import android.os.Bundle import android.view.View import de.solarisbank.identhub.bank.R -import de.solarisbank.identhub.R as coreR +import de.solarisbank.sdk.R as CoreR import de.solarisbank.identhub.bank.data.ErrorState import de.solarisbank.identhub.bank.feature.progress.ProgressIndicatorFragment import org.koin.androidx.viewmodel.ext.android.viewModel @@ -79,7 +79,7 @@ class ProcessingVerificationFragment : ProgressIndicatorFragment() { : ProcessingVerificationResult(), ErrorState {// 8. payment init auth person override val dialogTitleId = R.string.identhub_payment_init_auth_person_title override val dialogMessageId = R.string.identhub_payment_init_auth_person_message - override val dialogPositiveLabelId = coreR.string.identhub_ok_button + override val dialogPositiveLabelId = CoreR.string.identhub_ok_button override val dialogNegativeLabelId: Nothing? = null } @@ -87,7 +87,7 @@ class ProcessingVerificationFragment : ProgressIndicatorFragment() { : ProcessingVerificationResult(), ErrorState {// 9. payment init failed override val dialogTitleId = R.string.identhub_payment_init_failed_title override val dialogMessageId = R.string.identhub_payment_init_failed_message - override val dialogPositiveLabelId = coreR.string.identhub_ok_button + override val dialogPositiveLabelId = CoreR.string.identhub_ok_button override val dialogNegativeLabelId: Nothing? = null } @@ -95,14 +95,14 @@ class ProcessingVerificationFragment : ProgressIndicatorFragment() { : ProcessingVerificationResult(), ErrorState {// 10. payment init expired override val dialogTitleId = R.string.identhub_payment_init_expired_title override val dialogMessageId = R.string.identhub_payment_init_expired_message - override val dialogPositiveLabelId = coreR.string.identhub_ok_button + override val dialogPositiveLabelId = CoreR.string.identhub_ok_button override val dialogNegativeLabelId = R.string.identhub_iban_verification_invalid_iban_retry_button } object GenericError : ProcessingVerificationResult(), ErrorState { - override val dialogTitleId = coreR.string.identhub_generic_error_title - override val dialogMessageId = coreR.string.identhub_generic_error_message - override val dialogPositiveLabelId = coreR.string.identhub_ok_button + override val dialogTitleId = CoreR.string.identhub_generic_error_title + override val dialogMessageId = CoreR.string.identhub_generic_error_message + override val dialogPositiveLabelId = CoreR.string.identhub_ok_button override val dialogNegativeLabelId: Nothing? = null } } diff --git a/core/build.gradle b/core/build.gradle index 3994b35..b6bf2d5 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -8,7 +8,7 @@ plugins { } android { - namespace 'de.solarisbank.identhub' + namespace 'de.solarisbank.sdk' compileSdkVersion buildConfig.compileSdk resourcePrefix libConfig.resourcePrefix diff --git a/core/src/main/java/de/solarisbank/sdk/data/customization/CustomizationRepositoryImpl.kt b/core/src/main/java/de/solarisbank/sdk/data/customization/CustomizationRepositoryImpl.kt index 7b2737c..c5b3626 100644 --- a/core/src/main/java/de/solarisbank/sdk/data/customization/CustomizationRepositoryImpl.kt +++ b/core/src/main/java/de/solarisbank/sdk/data/customization/CustomizationRepositoryImpl.kt @@ -3,7 +3,7 @@ package de.solarisbank.sdk.data.customization import android.content.Context import android.graphics.Color import androidx.annotation.ColorRes -import de.solarisbank.identhub.R +import de.solarisbank.sdk.R import de.solarisbank.sdk.data.dto.Customization import de.solarisbank.sdk.data.dto.StyleDto import de.solarisbank.sdk.data.initial.InitialConfigStorage diff --git a/core/src/main/java/de/solarisbank/sdk/data/di/koin/CoreKoin.kt b/core/src/main/java/de/solarisbank/sdk/data/di/koin/CoreKoin.kt index bb10c52..3824cfb 100644 --- a/core/src/main/java/de/solarisbank/sdk/data/di/koin/CoreKoin.kt +++ b/core/src/main/java/de/solarisbank/sdk/data/di/koin/CoreKoin.kt @@ -1,7 +1,7 @@ package de.solarisbank.sdk.data.di.koin import android.content.Context -import de.solarisbank.identhub.BuildConfig +import de.solarisbank.sdk.BuildConfig import de.solarisbank.sdk.data.StartIdenthubConfig import de.solarisbank.sdk.logger.IdLogger import org.koin.android.ext.koin.androidContext diff --git a/core/src/main/java/de/solarisbank/sdk/data/di/koin/NetworkModule.kt b/core/src/main/java/de/solarisbank/sdk/data/di/koin/NetworkModule.kt index b1d3ea8..5d804ea 100644 --- a/core/src/main/java/de/solarisbank/sdk/data/di/koin/NetworkModule.kt +++ b/core/src/main/java/de/solarisbank/sdk/data/di/koin/NetworkModule.kt @@ -6,7 +6,7 @@ import android.content.pm.PackageManager import com.squareup.moshi.Moshi import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import de.solarisbank.identhub.BuildConfig +import de.solarisbank.sdk.BuildConfig import de.solarisbank.sdk.data.network.interceptor.DynamicBaseUrlInterceptor import de.solarisbank.sdk.logger.LoggerHttpInterceptor import okhttp3.Interceptor diff --git a/core/src/main/java/de/solarisbank/sdk/feature/alert/AlertDialogFragment.kt b/core/src/main/java/de/solarisbank/sdk/feature/alert/AlertDialogFragment.kt index ba5f9d7..c947348 100644 --- a/core/src/main/java/de/solarisbank/sdk/feature/alert/AlertDialogFragment.kt +++ b/core/src/main/java/de/solarisbank/sdk/feature/alert/AlertDialogFragment.kt @@ -14,7 +14,7 @@ import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import de.solarisbank.identhub.R +import de.solarisbank.sdk.R import de.solarisbank.sdk.domain.model.result.Event class AlertDialogFragment : BottomSheetDialogFragment() { diff --git a/core/src/main/java/de/solarisbank/sdk/feature/customization/UiCustomizations.kt b/core/src/main/java/de/solarisbank/sdk/feature/customization/UiCustomizations.kt index fb66e11..add448e 100644 --- a/core/src/main/java/de/solarisbank/sdk/feature/customization/UiCustomizations.kt +++ b/core/src/main/java/de/solarisbank/sdk/feature/customization/UiCustomizations.kt @@ -5,7 +5,7 @@ import android.graphics.drawable.RippleDrawable import android.graphics.drawable.ShapeDrawable import android.graphics.drawable.shapes.RoundRectShape import android.widget.* -import de.solarisbank.identhub.R +import de.solarisbank.sdk.R import de.solarisbank.sdk.data.dto.Customization sealed class ButtonStyle { diff --git a/core/src/main/java/de/solarisbank/sdk/feature/view/BulletListLayout.kt b/core/src/main/java/de/solarisbank/sdk/feature/view/BulletListLayout.kt index 0b40fed..e8cc1c0 100644 --- a/core/src/main/java/de/solarisbank/sdk/feature/view/BulletListLayout.kt +++ b/core/src/main/java/de/solarisbank/sdk/feature/view/BulletListLayout.kt @@ -7,7 +7,7 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat import androidx.core.view.updateLayoutParams -import de.solarisbank.identhub.R +import de.solarisbank.sdk.R import de.solarisbank.sdk.data.dto.Customization import de.solarisbank.sdk.feature.customization.customizeLinks diff --git a/core/src/main/java/de/solarisbank/sdk/feature/view/PhoneVerificationView.kt b/core/src/main/java/de/solarisbank/sdk/feature/view/PhoneVerificationView.kt index 63f535d..4d18532 100644 --- a/core/src/main/java/de/solarisbank/sdk/feature/view/PhoneVerificationView.kt +++ b/core/src/main/java/de/solarisbank/sdk/feature/view/PhoneVerificationView.kt @@ -6,7 +6,7 @@ import android.view.Gravity import android.view.LayoutInflater import android.widget.* import androidx.core.view.isVisible -import de.solarisbank.identhub.R +import de.solarisbank.sdk.R import de.solarisbank.sdk.data.dto.Customization import de.solarisbank.sdk.data.entity.formatMinutesAndSeconds import de.solarisbank.sdk.domain.model.result.Result diff --git a/core/src/main/java/de/solarisbank/sdk/feature/view/PinView.kt b/core/src/main/java/de/solarisbank/sdk/feature/view/PinView.kt index f13631c..1f8def5 100644 --- a/core/src/main/java/de/solarisbank/sdk/feature/view/PinView.kt +++ b/core/src/main/java/de/solarisbank/sdk/feature/view/PinView.kt @@ -14,7 +14,7 @@ import android.view.KeyEvent import android.view.View import android.widget.EditText import android.widget.LinearLayout -import de.solarisbank.identhub.R +import de.solarisbank.sdk.R import kotlin.math.max class PinView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null diff --git a/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/custom/DateInputTextView.kt b/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/custom/DateInputTextView.kt index ce7487d..26cb8f0 100644 --- a/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/custom/DateInputTextView.kt +++ b/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/custom/DateInputTextView.kt @@ -7,7 +7,7 @@ import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView import androidx.core.content.ContextCompat import de.solarisbank.identhub.fourthline.R -import de.solarisbank.identhub.R as CoreR +import de.solarisbank.sdk.R as CoreR import timber.log.Timber import java.util.* diff --git a/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/intro/FourthlineIntroFragment.kt b/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/intro/FourthlineIntroFragment.kt index 1e29db8..5af7f76 100644 --- a/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/intro/FourthlineIntroFragment.kt +++ b/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/intro/FourthlineIntroFragment.kt @@ -14,7 +14,7 @@ import androidx.core.view.isVisible import androidx.viewpager2.widget.ViewPager2 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback import de.solarisbank.identhub.fourthline.R -import de.solarisbank.identhub.R as CoreR +import de.solarisbank.sdk.R as CoreR import de.solarisbank.identhub.session.main.BaseFragment import de.solarisbank.sdk.domain.model.ResultState import de.solarisbank.sdk.feature.customization.customize diff --git a/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/passing/possibility/PassingPossibilityFragment.kt b/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/passing/possibility/PassingPossibilityFragment.kt index 63a1070..73d09e2 100644 --- a/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/passing/possibility/PassingPossibilityFragment.kt +++ b/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/passing/possibility/PassingPossibilityFragment.kt @@ -6,7 +6,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ProgressBar import de.solarisbank.identhub.fourthline.R -import de.solarisbank.identhub.R as CoreR +import de.solarisbank.sdk.R as CoreR import de.solarisbank.identhub.session.main.BaseFragment import de.solarisbank.sdk.feature.customization.customize import de.solarisbank.sdk.fourthline.FourthlineFlow diff --git a/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/scan/DocTypeSelectionFragment.kt b/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/scan/DocTypeSelectionFragment.kt index aae2ad6..7a67d0e 100644 --- a/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/scan/DocTypeSelectionFragment.kt +++ b/fourthline/src/main/java/de/solarisbank/sdk/fourthline/feature/ui/scan/DocTypeSelectionFragment.kt @@ -17,7 +17,7 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import de.solarisbank.identhub.fourthline.R -import de.solarisbank.identhub.R as coreR +import de.solarisbank.sdk.R as CoreR import de.solarisbank.identhub.session.main.BaseFragment import de.solarisbank.sdk.feature.customization.customize import de.solarisbank.sdk.feature.extension.buttonDisabled @@ -162,8 +162,8 @@ class DocTypeSelectionFragment: BaseFragment() { Timber.d("processState 4") progressBar!!.visibility = View.INVISIBLE showAlertFragment( - title = getString(coreR.string.identhub_generic_error_title), - message = getString(coreR.string.identhub_generic_error_message), + title = getString(CoreR.string.identhub_generic_error_title), + message = getString(CoreR.string.identhub_generic_error_message), positiveLabel = getString(R.string.identhub_quit_location_button), positiveAction = { identificationFailed( diff --git a/qes/src/main/java/de/solarisbank/identhub/qes/contract/preview/ContractSigningPreviewFragment.kt b/qes/src/main/java/de/solarisbank/identhub/qes/contract/preview/ContractSigningPreviewFragment.kt index 3bad102..f9bfe1c 100644 --- a/qes/src/main/java/de/solarisbank/identhub/qes/contract/preview/ContractSigningPreviewFragment.kt +++ b/qes/src/main/java/de/solarisbank/identhub/qes/contract/preview/ContractSigningPreviewFragment.kt @@ -16,7 +16,7 @@ import de.solarisbank.identhub.qes.contract.ContractViewModel import de.solarisbank.identhub.contract.adapter.DocumentAdapter import de.solarisbank.identhub.qes.QESFlow import de.solarisbank.identhub.qes.R -import de.solarisbank.identhub.R as CoreR +import de.solarisbank.sdk.R as CoreR import de.solarisbank.identhub.session.main.BaseFragment import de.solarisbank.sdk.data.dto.DocumentDto import de.solarisbank.sdk.domain.model.result.* diff --git a/session/src/main/java/de/solarisbank/identhub/session/main/BaseFragment.kt b/session/src/main/java/de/solarisbank/identhub/session/main/BaseFragment.kt index a58c275..5f5f23a 100644 --- a/session/src/main/java/de/solarisbank/identhub/session/main/BaseFragment.kt +++ b/session/src/main/java/de/solarisbank/identhub/session/main/BaseFragment.kt @@ -6,7 +6,7 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import de.solarisbank.identhub.R +import de.solarisbank.sdk.R import de.solarisbank.sdk.data.customization.CustomizationRepository import de.solarisbank.sdk.data.customization.GeneralCustomizer import de.solarisbank.sdk.data.di.koin.IdenthubKoinComponent diff --git a/session/src/main/java/de/solarisbank/identhub/session/main/MainActivity.kt b/session/src/main/java/de/solarisbank/identhub/session/main/MainActivity.kt index 35eaaef..78d030c 100644 --- a/session/src/main/java/de/solarisbank/identhub/session/main/MainActivity.kt +++ b/session/src/main/java/de/solarisbank/identhub/session/main/MainActivity.kt @@ -14,7 +14,7 @@ import androidx.navigation.NavController import androidx.navigation.NavDestination import androidx.navigation.fragment.NavHostFragment import de.solarisbank.identhub.session.R -import de.solarisbank.identhub.R as coreR +import de.solarisbank.sdk.R as CoreR import de.solarisbank.sdk.data.StartIdenthubConfig import de.solarisbank.identhub.session.StartIdenthubContract import de.solarisbank.sdk.data.di.koin.IdentHubKoinContext @@ -132,11 +132,11 @@ class MainActivity : AppCompatActivity(), IdenthubKoinComponent { private fun showGenericError() { showAlertFragment( - title = getString(coreR.string.identhub_generic_error_title), - message = getString(coreR.string.identhub_generic_error_message), - negativeLabel = getString(coreR.string.identhub_generic_retry_button), + title = getString(CoreR.string.identhub_generic_error_title), + message = getString(CoreR.string.identhub_generic_error_message), + negativeLabel = getString(CoreR.string.identhub_generic_retry_button), negativeAction = { viewModel.onAction(MainAction.RetryTapped) }, - positiveLabel = getString(coreR.string.identhub_identity_dialog_quit_process_positive_button), + positiveLabel = getString(CoreR.string.identhub_identity_dialog_quit_process_positive_button), positiveAction = ::close ) } @@ -192,10 +192,10 @@ class MainActivity : AppCompatActivity(), IdenthubKoinComponent { private fun showQuitDialog() { showAlertFragment( - title = getString(coreR.string.identhub_identity_dialog_quit_process_title), - message = getString(coreR.string.identhub_identity_dialog_quit_process_message), - positiveLabel = getString(coreR.string.identhub_identity_dialog_quit_process_positive_button), - negativeLabel = getString(coreR.string.identhub_identity_dialog_quit_process_negative_button), + title = getString(CoreR.string.identhub_identity_dialog_quit_process_title), + message = getString(CoreR.string.identhub_identity_dialog_quit_process_message), + positiveLabel = getString(CoreR.string.identhub_identity_dialog_quit_process_positive_button), + negativeLabel = getString(CoreR.string.identhub_identity_dialog_quit_process_negative_button), positiveAction = ::close, tag = "BackButtonAlert") }