Skip to content

Commit

Permalink
Change core namespace in order to preserve backwards compatibility (#…
Browse files Browse the repository at this point in the history
…455)
  • Loading branch information
mblcdr authored Jan 17, 2024
1 parent 1d3ffe5 commit 555ae8c
Show file tree
Hide file tree
Showing 18 changed files with 40 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}

Expand All @@ -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
}

Expand All @@ -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
}

Expand All @@ -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
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -79,30 +79,30 @@ 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
}

class PaymentInitFailedError(val nextStep: String)
: 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
}

class PaymentInitExpiredError(val nextStep: String)
: 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
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

android {
namespace 'de.solarisbank.identhub'
namespace 'de.solarisbank.sdk'
compileSdkVersion buildConfig.compileSdk
resourcePrefix libConfig.resourcePrefix

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
}
Expand Down Expand Up @@ -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")
}
Expand Down

0 comments on commit 555ae8c

Please sign in to comment.