diff --git a/.github/workflows/apk.yml b/.github/workflows/apk.yml index e88775afdd..6a2f5795a7 100644 --- a/.github/workflows/apk.yml +++ b/.github/workflows/apk.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '18' diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml index 959ac63ae2..4873a3a338 100644 --- a/.github/workflows/detekt.yml +++ b/.github/workflows/detekt.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Java SDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '18' diff --git a/.github/workflows/internal_release.yml b/.github/workflows/internal_release.yml index b795422b22..94ad022b32 100644 --- a/.github/workflows/internal_release.yml +++ b/.github/workflows/internal_release.yml @@ -26,7 +26,7 @@ jobs: fetch-depth: 0 #Fetch all history for all branches and tags - name: Setup Java SDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '18' diff --git a/.github/workflows/issue_assign.yml b/.github/workflows/issue_assign.yml index 1e81af7cdd..76126c381e 100644 --- a/.github/workflows/issue_assign.yml +++ b/.github/workflows/issue_assign.yml @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Java SDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '18' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ae741ecc0e..9a34c32449 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Java SDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '18' diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 62f0a43d63..b4e8923932 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -14,7 +14,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v8 + - uses: actions/stale@v9 with: days-before-issue-stale: 30 days-before-issue-close: 7 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 47f7d7fbd0..2ae331fecf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Java SDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '18' @@ -40,7 +40,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Java SDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '18' diff --git a/.github/workflows/test_automations.yml b/.github/workflows/test_automations.yml index 75500d8f3f..07f8141d38 100644 --- a/.github/workflows/test_automations.yml +++ b/.github/workflows/test_automations.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Java SDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '18' diff --git a/.github/workflows/upgrade-gradle-wrapper.yml b/.github/workflows/upgrade-gradle-wrapper.yml index 5c28bf8d7d..a94ea286cf 100644 --- a/.github/workflows/upgrade-gradle-wrapper.yml +++ b/.github/workflows/upgrade-gradle-wrapper.yml @@ -21,7 +21,7 @@ jobs: git config --global url."https://unused-username:${WRAPPER_UPGRADE_GIT_TOKEN}@github.com/".insteadOf "https://github.com/" - name: Setup Java SDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '18' diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 97452c7ee4..c58345884b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -228,4 +228,4 @@ dependencies { kover(projects.tempOldDesign) kover(projects.widgetAddTransaction) kover(projects.widgetBalance) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/ivy/IvyNavGraph.kt b/app/src/main/java/com/ivy/IvyNavGraph.kt index 1b1df7128f..904c26fd7a 100644 --- a/app/src/main/java/com/ivy/IvyNavGraph.kt +++ b/app/src/main/java/com/ivy/IvyNavGraph.kt @@ -82,4 +82,4 @@ fun BoxWithConstraintsScope.IvyNavGraph(screen: Screen?) { ContributorsScreen -> ContributorsScreenImpl() ReleasesScreen -> ReleasesScreenImpl() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/ivy/wallet/IvyAndroidApp.kt b/app/src/main/java/com/ivy/wallet/IvyAndroidApp.kt index 07b5d107ca..abe074ae6f 100644 --- a/app/src/main/java/com/ivy/wallet/IvyAndroidApp.kt +++ b/app/src/main/java/com/ivy/wallet/IvyAndroidApp.kt @@ -31,4 +31,4 @@ class IvyAndroidApp : Application(), Configuration.Provider { Timber.plant(DebugTree()) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/ivy/wallet/IvyAppStarter.kt b/app/src/main/java/com/ivy/wallet/IvyAppStarter.kt index 165cba7c32..c829ff5ab6 100644 --- a/app/src/main/java/com/ivy/wallet/IvyAppStarter.kt +++ b/app/src/main/java/com/ivy/wallet/IvyAppStarter.kt @@ -2,8 +2,8 @@ package com.ivy.wallet import android.content.Context import android.content.Intent -import com.ivy.domain.AppStarter import com.ivy.base.model.TransactionType +import com.ivy.domain.AppStarter import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject @@ -36,4 +36,4 @@ class IvyAppStarter @Inject constructor( private fun Intent.applyWidgetStartFlags() { flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/ivy/wallet/PaymentTileService.kt b/app/src/main/java/com/ivy/wallet/PaymentTileService.kt index 20037cea0b..d8de201376 100644 --- a/app/src/main/java/com/ivy/wallet/PaymentTileService.kt +++ b/app/src/main/java/com/ivy/wallet/PaymentTileService.kt @@ -37,4 +37,4 @@ class PaymentTileService : TileService() { override fun onTileRemoved() { super.onTileRemoved() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/ivy/wallet/RootActivity.kt b/app/src/main/java/com/ivy/wallet/RootActivity.kt index ec9d1ee6a1..69a20b87cf 100644 --- a/app/src/main/java/com/ivy/wallet/RootActivity.kt +++ b/app/src/main/java/com/ivy/wallet/RootActivity.kt @@ -37,8 +37,8 @@ import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat import com.google.android.play.core.review.ReviewManagerFactory import com.ivy.IvyNavGraph -import com.ivy.domain.RootScreen import com.ivy.design.api.IvyUI +import com.ivy.domain.RootScreen import com.ivy.home.customerjourney.CustomerJourneyCardsProvider import com.ivy.legacy.Constants import com.ivy.legacy.IvyWalletCtx @@ -154,13 +154,13 @@ class RootActivity : AppCompatActivity(), RootScreen { private fun setupDatePicker() { ivyContext.onShowDatePicker = { minDate, - maxDate, - initialDate, - onDatePicked -> + maxDate, + initialDate, + onDatePicked -> val datePicker = MaterialDatePicker.Builder.datePicker() - .setSelection(MaterialDatePicker.todayInUtcMilliseconds()) - .build() + .setSelection(MaterialDatePicker.todayInUtcMilliseconds()) + .build() datePicker.show(supportFragmentManager, "datePicker") datePicker.addOnPositiveButtonClickListener { onDatePicked(LocalDate.ofEpochDay(it / MILLISECONDS_IN_DAY)) @@ -338,7 +338,7 @@ class RootActivity : AppCompatActivity(), RootScreen { ) .setAllowedAuthenticators( BiometricManager.Authenticators.BIOMETRIC_WEAK or - BiometricManager.Authenticators.DEVICE_CREDENTIAL + BiometricManager.Authenticators.DEVICE_CREDENTIAL ) .setConfirmationRequired(false) .build() diff --git a/app/src/main/java/com/ivy/wallet/RootViewModel.kt b/app/src/main/java/com/ivy/wallet/RootViewModel.kt index 50deafaebb..de6ad07d19 100644 --- a/app/src/main/java/com/ivy/wallet/RootViewModel.kt +++ b/app/src/main/java/com/ivy/wallet/RootViewModel.kt @@ -6,6 +6,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.ivy.base.legacy.Theme import com.ivy.base.legacy.stringRes +import com.ivy.base.model.TransactionType +import com.ivy.data.db.dao.read.SettingsDao import com.ivy.frp.test.TestIdlingResource import com.ivy.legacy.IvyWalletCtx import com.ivy.legacy.data.SharedPrefs @@ -15,8 +17,6 @@ import com.ivy.navigation.EditTransactionScreen import com.ivy.navigation.MainScreen import com.ivy.navigation.Navigation import com.ivy.navigation.OnboardingScreen -import com.ivy.data.db.dao.read.SettingsDao -import com.ivy.base.model.TransactionType import com.ivy.resources.R import com.ivy.wallet.domain.deprecated.logic.notification.TransactionReminderLogic import com.ivy.wallet.migrations.MigrationsManager diff --git a/app/src/main/java/com/ivy/wallet/di/AppBindingsModule.kt b/app/src/main/java/com/ivy/wallet/di/AppBindingsModule.kt index 110074a52c..b48a1a8dcb 100644 --- a/app/src/main/java/com/ivy/wallet/di/AppBindingsModule.kt +++ b/app/src/main/java/com/ivy/wallet/di/AppBindingsModule.kt @@ -12,4 +12,4 @@ import dagger.hilt.components.SingletonComponent abstract class AppBindingsModule { @Binds abstract fun appStarter(appStarter: IvyAppStarter): AppStarter -} \ No newline at end of file +} diff --git a/app/src/main/java/com/ivy/wallet/migrations/impl/DisableGitHubAutoBackupMigration.kt b/app/src/main/java/com/ivy/wallet/migrations/impl/DisableGitHubAutoBackupMigration.kt index 852c3ab7c9..ef2f109694 100644 --- a/app/src/main/java/com/ivy/wallet/migrations/impl/DisableGitHubAutoBackupMigration.kt +++ b/app/src/main/java/com/ivy/wallet/migrations/impl/DisableGitHubAutoBackupMigration.kt @@ -27,4 +27,4 @@ class DisableGitHubAutoBackupMigration @Inject constructor( it.remove(DatastoreKeys.GITHUB_LAST_BACKUP_EPOCH_SEC) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/ivy/wallet/ui/applocked/AppLockedScreen.kt b/app/src/main/java/com/ivy/wallet/ui/applocked/AppLockedScreen.kt index a26a40663e..169d373b43 100644 --- a/app/src/main/java/com/ivy/wallet/ui/applocked/AppLockedScreen.kt +++ b/app/src/main/java/com/ivy/wallet/ui/applocked/AppLockedScreen.kt @@ -28,12 +28,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.utils.hasLockScreen +import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gray import com.ivy.wallet.ui.theme.White import com.ivy.wallet.ui.theme.components.IvyButton -import com.ivy.legacy.utils.hasLockScreen @Composable fun BoxWithConstraintsScope.AppLockedScreen( diff --git a/automations/base/build.gradle.kts b/automations/base/build.gradle.kts index 11f9d39ac9..a883b211c5 100644 --- a/automations/base/build.gradle.kts +++ b/automations/base/build.gradle.kts @@ -4,4 +4,4 @@ plugins { dependencies { api(libs.bundles.ktor) -} \ No newline at end of file +} diff --git a/automations/base/src/main/kotlin/ivy/automate/base/ArrowExt.kt b/automations/base/src/main/kotlin/ivy/automate/base/ArrowExt.kt index 36381910dd..3664fc0f00 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/ArrowExt.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/ArrowExt.kt @@ -7,4 +7,4 @@ fun Either.getOrThrow(): B { ifLeft = { throw IvyError(it.toString()) }, ifRight = { it } ) -} \ No newline at end of file +} diff --git a/automations/base/src/main/kotlin/ivy/automate/base/Common.kt b/automations/base/src/main/kotlin/ivy/automate/base/Common.kt index c7314a52a3..be51b457bc 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/Common.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/Common.kt @@ -14,4 +14,3 @@ suspend fun catchIO( block() } } - diff --git a/automations/base/src/main/kotlin/ivy/automate/base/ExactDsl.kt b/automations/base/src/main/kotlin/ivy/automate/base/ExactDsl.kt index 649a248db1..b7c11238fe 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/ExactDsl.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/ExactDsl.kt @@ -18,4 +18,4 @@ interface Exact { ifLeft = { throw ExactError(it) }, ifRight = { it }, ) -} \ No newline at end of file +} diff --git a/automations/base/src/main/kotlin/ivy/automate/base/IvyError.kt b/automations/base/src/main/kotlin/ivy/automate/base/IvyError.kt index 4c9df7b0b8..9e31bb1e9d 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/IvyError.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/IvyError.kt @@ -1,3 +1,3 @@ package ivy.automate.base -class IvyError(msg: String) : Exception(msg) \ No newline at end of file +class IvyError(msg: String) : Exception(msg) diff --git a/automations/base/src/main/kotlin/ivy/automate/base/github/GitHubService.kt b/automations/base/src/main/kotlin/ivy/automate/base/github/GitHubService.kt index 0023ac54a3..8f77a9f530 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/github/GitHubService.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/github/GitHubService.kt @@ -33,4 +33,4 @@ interface GitHubService { issueNumber: GitHubIssueNumber, assignee: GitHubUsername ): Either -} \ No newline at end of file +} diff --git a/automations/base/src/main/kotlin/ivy/automate/base/github/GitHubServiceImpl.kt b/automations/base/src/main/kotlin/ivy/automate/base/github/GitHubServiceImpl.kt index 90892c1134..5b03cb95b3 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/github/GitHubServiceImpl.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/github/GitHubServiceImpl.kt @@ -138,4 +138,4 @@ class GitHubServiceImpl( @Serializable data class AssigneesPayload(val assignees: List) -} \ No newline at end of file +} diff --git a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubComment.kt b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubComment.kt index d7215bc60f..364bea752c 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubComment.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubComment.kt @@ -3,4 +3,4 @@ package ivy.automate.base.github.model data class GitHubComment( val author: GitHubUser, val text: String, -) \ No newline at end of file +) diff --git a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubIssue.kt b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubIssue.kt index 2c9ec58ab9..e6ee6979b5 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubIssue.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubIssue.kt @@ -2,4 +2,4 @@ package ivy.automate.base.github.model data class GitHubIssue( val assignee: GitHubUser? -) \ No newline at end of file +) diff --git a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubIssueNumber.kt b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubIssueNumber.kt index 0daf5071db..a28f9bc5c7 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubIssueNumber.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubIssueNumber.kt @@ -15,4 +15,4 @@ value class GitHubIssueNumber private constructor(val value: String) { return GitHubIssueNumber(raw.trim()) } } -} \ No newline at end of file +} diff --git a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubLabel.kt b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubLabel.kt index bea32222b7..8626821975 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubLabel.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubLabel.kt @@ -2,4 +2,4 @@ package ivy.automate.base.github.model data class GitHubLabel( val name: GitHubLabelName, -) \ No newline at end of file +) diff --git a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubLabelName.kt b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubLabelName.kt index 13ac3a96aa..6cd2caf6c6 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubLabelName.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubLabelName.kt @@ -14,4 +14,4 @@ value class GitHubLabelName private constructor(val value: String) { return GitHubLabelName(raw.trim()) } } -} \ No newline at end of file +} diff --git a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubPAT.kt b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubPAT.kt index a20f6bf194..e82e999846 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubPAT.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubPAT.kt @@ -14,4 +14,4 @@ value class GitHubPAT private constructor(val value: String) { return GitHubPAT(raw.trim()) } } -} \ No newline at end of file +} diff --git a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubUser.kt b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubUser.kt index 376531db48..e7b7154ca6 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubUser.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubUser.kt @@ -2,4 +2,4 @@ package ivy.automate.base.github.model data class GitHubUser( val username: GitHubUsername -) \ No newline at end of file +) diff --git a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubUsername.kt b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubUsername.kt index 06aad56444..3e85828418 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubUsername.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/github/model/GitHubUsername.kt @@ -14,4 +14,4 @@ value class GitHubUsername private constructor(val value: String) { return GitHubUsername(raw.trim()) } } -} \ No newline at end of file +} diff --git a/automations/base/src/main/kotlin/ivy/automate/base/github/model/NotBlankTrimmedString.kt b/automations/base/src/main/kotlin/ivy/automate/base/github/model/NotBlankTrimmedString.kt index 72ee310f90..7a31d40b07 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/github/model/NotBlankTrimmedString.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/github/model/NotBlankTrimmedString.kt @@ -14,4 +14,4 @@ value class NotBlankTrimmedString private constructor(val value: String) { return NotBlankTrimmedString(raw.trim()) } } -} \ No newline at end of file +} diff --git a/automations/base/src/main/kotlin/ivy/automate/base/ktor/KtorClientScope.kt b/automations/base/src/main/kotlin/ivy/automate/base/ktor/KtorClientScope.kt index dadd8076d7..770c638adc 100644 --- a/automations/base/src/main/kotlin/ivy/automate/base/ktor/KtorClientScope.kt +++ b/automations/base/src/main/kotlin/ivy/automate/base/ktor/KtorClientScope.kt @@ -28,4 +28,4 @@ suspend fun ktorClientScope(block: suspend KtorClientScope.() -> Unit) { override val ktorClient: HttpClient = ktorClient } ktorClient.use { scope.block() } -} \ No newline at end of file +} diff --git a/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubIssueNumberTest.kt b/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubIssueNumberTest.kt index 97e4b2570c..3a535cf1a3 100644 --- a/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubIssueNumberTest.kt +++ b/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubIssueNumberTest.kt @@ -27,4 +27,4 @@ class GitHubIssueNumberTest : FreeSpec({ // then res.shouldBeRight().value shouldBe "2763" } -}) \ No newline at end of file +}) diff --git a/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubLabelNameTest.kt b/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubLabelNameTest.kt index e7f953cf49..72fd69e66b 100644 --- a/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubLabelNameTest.kt +++ b/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubLabelNameTest.kt @@ -23,4 +23,4 @@ class GitHubLabelNameTest : FreeSpec({ // then res.shouldBeRight().value shouldBe "devexp" } -}) \ No newline at end of file +}) diff --git a/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubPATTest.kt b/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubPATTest.kt index 130e462e8a..e1e9e3e45d 100644 --- a/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubPATTest.kt +++ b/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubPATTest.kt @@ -25,4 +25,4 @@ class GitHubPATTest : FreeSpec({ // then res.shouldBeRight().value shouldBe "abc" } -}) \ No newline at end of file +}) diff --git a/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubUsernameTest.kt b/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubUsernameTest.kt index 9fbd3f15a1..820adb0085 100644 --- a/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubUsernameTest.kt +++ b/automations/base/src/test/kotlin/ivy/automate/base/model/GitHubUsernameTest.kt @@ -23,4 +23,4 @@ class GitHubUsernameTest : FreeSpec({ // then res.shouldBeRight().value shouldBe "ILIYANGERMANOV" } -}) \ No newline at end of file +}) diff --git a/automations/base/src/test/kotlin/ivy/automate/base/model/NotBlankTrimmedStringTest.kt b/automations/base/src/test/kotlin/ivy/automate/base/model/NotBlankTrimmedStringTest.kt index 114ee771c9..237ff6fa74 100644 --- a/automations/base/src/test/kotlin/ivy/automate/base/model/NotBlankTrimmedStringTest.kt +++ b/automations/base/src/test/kotlin/ivy/automate/base/model/NotBlankTrimmedStringTest.kt @@ -25,4 +25,4 @@ class NotBlankTrimmedStringTest : FreeSpec({ // then res.shouldBeRight().value shouldBe "abc" } -}) \ No newline at end of file +}) diff --git a/automations/issue-assign/build.gradle.kts b/automations/issue-assign/build.gradle.kts index ccbf2ea81e..debcd89c9c 100644 --- a/automations/issue-assign/build.gradle.kts +++ b/automations/issue-assign/build.gradle.kts @@ -9,4 +9,4 @@ application { dependencies { implementation(projects.automations.base) -} \ No newline at end of file +} diff --git a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/ActionExecutor.kt b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/ActionExecutor.kt index 8057da7b5c..d276af3841 100644 --- a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/ActionExecutor.kt +++ b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/ActionExecutor.kt @@ -80,4 +80,4 @@ private fun StringBuilder.warn(user: GitHubUser) { private fun StringBuilder.readContributingMd() { append("\n\n") append("Also, make sure to read our [Contribution Guidelines](${Constants.CONTRIBUTING_URL}).") -} \ No newline at end of file +} diff --git a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/ArgsParser.kt b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/ArgsParser.kt index c91c827503..d17a9b23f0 100644 --- a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/ArgsParser.kt +++ b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/ArgsParser.kt @@ -41,4 +41,4 @@ private fun Map.ensureArgument(key: String): String { "Argument '$key' is missing." } return value -} \ No newline at end of file +} diff --git a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/CommentAnalyzer.kt b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/CommentAnalyzer.kt index 98359b81f9..17648a7d5b 100644 --- a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/CommentAnalyzer.kt +++ b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/CommentAnalyzer.kt @@ -26,4 +26,4 @@ fun analyzeCommentIntention(comment: GitHubComment): CommentIntention { else -> CommentIntention.Unknown } -} \ No newline at end of file +} diff --git a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/Constants.kt b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/Constants.kt index d49b778ecb..540fd03a23 100644 --- a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/Constants.kt +++ b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/Constants.kt @@ -8,4 +8,4 @@ object Constants { const val ISSUES_URL = "https://github.com/Ivy-Apps/ivy-wallet/issues" const val CONTRIBUTING_URL = "https://github.com/Ivy-Apps/ivy-wallet/blob/main/CONTRIBUTING.md" -} \ No newline at end of file +} diff --git a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/DetermineAction.kt b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/DetermineAction.kt index 474c1de882..c6851aff4c 100644 --- a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/DetermineAction.kt +++ b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/DetermineAction.kt @@ -97,4 +97,4 @@ private suspend fun checkLabelsForApproved( val isApproved = labels.any { it.name.value == "approved" } isApproved -} \ No newline at end of file +} diff --git a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/Main.kt b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/Main.kt index 1787057086..e6629ea295 100644 --- a/automations/issue-assign/src/main/kotlin/ivy/automate/issue/Main.kt +++ b/automations/issue-assign/src/main/kotlin/ivy/automate/issue/Main.kt @@ -38,4 +38,4 @@ private suspend fun execute(argsArr: Array): Either = ei is Action.NotApproved -> action.execute(args).bind() is Action.DoNothing -> "Do nothing." } -} \ No newline at end of file +} diff --git a/automations/issue-assign/src/test/kotlin/ivy/automate/issue/ActionExecutorTest.kt b/automations/issue-assign/src/test/kotlin/ivy/automate/issue/ActionExecutorTest.kt index b041bcc3d8..04a0e55616 100644 --- a/automations/issue-assign/src/test/kotlin/ivy/automate/issue/ActionExecutorTest.kt +++ b/automations/issue-assign/src/test/kotlin/ivy/automate/issue/ActionExecutorTest.kt @@ -215,4 +215,4 @@ class ActionExecutorTest : FreeSpec({ } } } -}) \ No newline at end of file +}) diff --git a/automations/issue-assign/src/test/kotlin/ivy/automate/issue/ArgsParserTest.kt b/automations/issue-assign/src/test/kotlin/ivy/automate/issue/ArgsParserTest.kt index 1799de13d0..655b640014 100644 --- a/automations/issue-assign/src/test/kotlin/ivy/automate/issue/ArgsParserTest.kt +++ b/automations/issue-assign/src/test/kotlin/ivy/automate/issue/ArgsParserTest.kt @@ -80,4 +80,4 @@ class ArgsParserTest : FreeSpec({ issueNumber = GitHubIssueNumber("123") ) } -}) \ No newline at end of file +}) diff --git a/automations/issue-assign/src/test/kotlin/ivy/automate/issue/CommentAnalyzerTest.kt b/automations/issue-assign/src/test/kotlin/ivy/automate/issue/CommentAnalyzerTest.kt index de0bd98809..e7006c92c0 100644 --- a/automations/issue-assign/src/test/kotlin/ivy/automate/issue/CommentAnalyzerTest.kt +++ b/automations/issue-assign/src/test/kotlin/ivy/automate/issue/CommentAnalyzerTest.kt @@ -36,7 +36,7 @@ class CommentAnalyzerTest : FreeSpec({ row("I am on it", CommentIntention.TakeIssue(user)), row( "yeah i am on it, also i wanted to ask " + - "what resources should i use learn android", + "what resources should i use learn android", CommentIntention.TakeIssue(user) ), row("want to contribute", CommentIntention.Unknown), @@ -63,8 +63,8 @@ class CommentAnalyzerTest : FreeSpec({ ), row( "Hi @ILIYANGERMANOV, Assign this issue to me." + - "I think i will require some help in it from your side, " + - "so please bear with me.\n", + "I think i will require some help in it from your side, " + + "so please bear with me.\n", CommentIntention.Unknown ), row( @@ -82,4 +82,4 @@ class CommentAnalyzerTest : FreeSpec({ intention shouldBe expectedIntention } } -}) \ No newline at end of file +}) diff --git a/automations/issue-assign/src/test/kotlin/ivy/automate/issue/DetermineActionTest.kt b/automations/issue-assign/src/test/kotlin/ivy/automate/issue/DetermineActionTest.kt index 716680cac4..ceb74ab9f8 100644 --- a/automations/issue-assign/src/test/kotlin/ivy/automate/issue/DetermineActionTest.kt +++ b/automations/issue-assign/src/test/kotlin/ivy/automate/issue/DetermineActionTest.kt @@ -255,4 +255,4 @@ class DetermineActionTest : FreeSpec({ } } } -}) \ No newline at end of file +}) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6e79cf8689..b1f937da56 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -24,7 +24,6 @@ dependencies { implementation(libs.ksp.plugin) implementation(libs.cashapp.molecule.plugin) - // Make version catalog available in precompiled scripts // https://github.com/gradle/gradle/issues/15383#issuecomment-1567461389 implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) diff --git a/buildSrc/src/main/kotlin/ivy.compose.gradle.kts b/buildSrc/src/main/kotlin/ivy.compose.gradle.kts index 228c1cc4bd..85d67a23fd 100644 --- a/buildSrc/src/main/kotlin/ivy.compose.gradle.kts +++ b/buildSrc/src/main/kotlin/ivy.compose.gradle.kts @@ -30,4 +30,4 @@ dependencies { implementation(libs.bundles.compose) lintChecks(libs.slack.lint.compose) -} \ No newline at end of file +} diff --git a/buildSrc/src/main/kotlin/ivy.feature.gradle.kts b/buildSrc/src/main/kotlin/ivy.feature.gradle.kts index 7b55a04035..5e4ac36a8b 100644 --- a/buildSrc/src/main/kotlin/ivy.feature.gradle.kts +++ b/buildSrc/src/main/kotlin/ivy.feature.gradle.kts @@ -1,4 +1,4 @@ plugins { id("ivy.module") id("ivy.compose") -} \ No newline at end of file +} diff --git a/buildSrc/src/main/kotlin/ivy.module.gradle.kts b/buildSrc/src/main/kotlin/ivy.module.gradle.kts index 3b04676729..5a8080dea0 100644 --- a/buildSrc/src/main/kotlin/ivy.module.gradle.kts +++ b/buildSrc/src/main/kotlin/ivy.module.gradle.kts @@ -51,4 +51,4 @@ dependencies { implementation(catalog.library("kotlinx-serialization-json")) testImplementation(libs.bundles.testing) -} \ No newline at end of file +} diff --git a/buildSrc/src/main/kotlin/ivy.room.gradle.kts b/buildSrc/src/main/kotlin/ivy.room.gradle.kts index ccba503e87..0cd44e0092 100644 --- a/buildSrc/src/main/kotlin/ivy.room.gradle.kts +++ b/buildSrc/src/main/kotlin/ivy.room.gradle.kts @@ -9,4 +9,4 @@ dependencies { ksp { arg("room.schemaLocation", "$projectDir/schemas") -} \ No newline at end of file +} diff --git a/buildSrc/src/main/kotlin/ivy.script.gradle.kts b/buildSrc/src/main/kotlin/ivy.script.gradle.kts index 09ccfb6fb8..aaa74e838d 100644 --- a/buildSrc/src/main/kotlin/ivy.script.gradle.kts +++ b/buildSrc/src/main/kotlin/ivy.script.gradle.kts @@ -25,4 +25,4 @@ dependencies { implementation(catalog.library("kotlinx-serialization-json")) testImplementation(libs.bundles.testing) -} \ No newline at end of file +} diff --git a/buildSrc/src/main/kotlin/ivy.widget.gradle.kts b/buildSrc/src/main/kotlin/ivy.widget.gradle.kts index 8727630fb1..819ec37672 100644 --- a/buildSrc/src/main/kotlin/ivy.widget.gradle.kts +++ b/buildSrc/src/main/kotlin/ivy.widget.gradle.kts @@ -16,4 +16,4 @@ android { dependencies { implementation(libs.bundles.glance) implementation(libs.bundles.activity) -} \ No newline at end of file +} diff --git a/config/detekt/baseline.yml b/config/detekt/baseline.yml index f4e2637d3f..4beb1b3a3a 100644 --- a/config/detekt/baseline.yml +++ b/config/detekt/baseline.yml @@ -2369,17 +2369,16 @@ LongMethod:OnboardingSplashLogin.kt$@Composable fun BoxWithConstraintsScope.OnboardingSplashLogin( onboardingState: OnboardingState, opGoogleSignIn: OpResult<Unit>?, onLoginWithGoogle: () -> Unit, onSkip: () -> Unit, ) LongMethod:PieChartStatisticScreen.kt$@ExperimentalFoundationApi @Composable private fun BoxWithConstraintsScope.UI( state: PieChartStatisticState, onEvent: (PieChartStatisticEvent) -> Unit = {} ) LongMethod:ReportScreen.kt$@ExperimentalFoundationApi @Composable private fun BoxWithConstraintsScope.UI( state: ReportScreenState = ReportScreenState(), onEventHandler: (ReportScreenEvent) -> Unit = {} ) - LongMethod:SettingsScreen.kt$@ExperimentalFoundationApi @Composable private fun BoxWithConstraintsScope.UI( currencyCode: String, theme: Theme, onSwitchTheme: () -> Unit, lockApp: Boolean, nameLocalAccount: String?, onSetCurrency: (String) -> Unit, startDateOfMonth: Int = 1, showNotifications: Boolean = true, hideCurrentBalance: Boolean = false, progressState: Boolean = false, treatTransfersAsIncomeExpense: Boolean = false, onSetName: (String) -> Unit = {}, onBackupData: () -> Unit = {}, onExportToCSV: () -> Unit = {}, onSetLockApp: (Boolean) -> Unit = {}, onSetShowNotifications: (Boolean) -> Unit = {}, onSetTreatTransfersAsIncExp: (Boolean) -> Unit = {}, onSetHideCurrentBalance: (Boolean) -> Unit = {}, onSetStartDateOfMonth: (Int) -> Unit = {}, onDeleteAllUserData: () -> Unit = {}, onDeleteCloudUserData: () -> Unit = {}, ) + LongMethod:SettingsScreen.kt$@ExperimentalFoundationApi @Composable private fun BoxWithConstraintsScope.UI( currencyCode: String, theme: Theme, onSwitchTheme: () -> Unit, lockApp: Boolean, nameLocalAccount: String?, onSetCurrency: (String) -> Unit, startDateOfMonth: Int = 1, showNotifications: Boolean = true, hideCurrentBalance: Boolean = false, hideIncome: Boolean = false, progressState: Boolean = false, treatTransfersAsIncomeExpense: Boolean = false, onSetName: (String) -> Unit = {}, onBackupData: () -> Unit = {}, onExportToCSV: () -> Unit = {}, onSetLockApp: (Boolean) -> Unit = {}, onSetShowNotifications: (Boolean) -> Unit = {}, onSetTreatTransfersAsIncExp: (Boolean) -> Unit = {}, onSetHideCurrentBalance: (Boolean) -> Unit = {}, onSetHideIncome: (Boolean) -> Unit = {}, onSetStartDateOfMonth: (Int) -> Unit = {}, onDeleteAllUserData: () -> Unit = {}, onDeleteCloudUserData: () -> Unit = {}, ) LongMethod:TransactionCard.kt$@Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable fun TransactionCard( baseData: AppBaseData, transaction: Transaction, onPayOrGet: (Transaction) -> Unit, onSkipTransaction: (Transaction) -> Unit = {}, onClick: (Transaction) -> Unit, ) LongMethod:TransactionsScreen.kt$@Composable private fun BoxWithConstraintsScope.UI( period: TimePeriod, baseCurrency: String, currency: String, skipAllModalVisible: Boolean, onSkipAllModalVisible: (Boolean) -> Unit, account: Account?, category: Category?, accountNameConfirmation: TextFieldValue, updateAccountNameConfirmation: (String) -> Unit, enableDeletionButton: Boolean, categories: ImmutableList<Category>, accounts: ImmutableList<Account>, balance: Double, balanceBaseCurrency: Double?, income: Double, expenses: Double, choosePeriodModal: ChoosePeriodModalData?, history: ImmutableList<TransactionHistoryItem>, onPreviousMonth: () -> Unit, onNextMonth: () -> Unit, onSetPeriod: (TimePeriod) -> Unit, onEditAccount: (Account, Double) -> Unit, onEditCategory: (Category) -> Unit, onDelete: () -> Unit, deleteModal1Visible: Boolean, onDeleteModal1Visible: (Boolean) -> Unit, initWithTransactions: Boolean = false, treatTransfersAsIncomeExpense: Boolean = false, upcomingExpanded: Boolean = true, setUpcomingExpanded: (Boolean) -> Unit = {}, upcomingIncome: Double = 0.0, upcomingExpenses: Double = 0.0, upcoming: ImmutableList<Transaction> = persistentListOf(), overdueExpanded: Boolean = true, setOverdueExpanded: (Boolean) -> Unit = {}, overdueIncome: Double = 0.0, overdueExpenses: Double = 0.0, overdue: ImmutableList<Transaction> = persistentListOf(), onPayOrGet: (Transaction) -> Unit = {}, onSkipTransaction: (Transaction) -> Unit = {}, onSkipAllTransactions: (List<Transaction>) -> Unit = {}, onChoosePeriodModal: (ChoosePeriodModalData?) -> Unit ) LongParameterList:EditBottomSheet.kt$( initialTransactionId: UUID?, type: TransactionType, accounts: List<Account>, selectedAccount: Account?, toAccount: Account?, amount: Double, currency: String, convertedAmount: Double? = null, convertedAmountCurrencyCode: String? = null, amountModalShown: Boolean, setAmountModalShown: (Boolean) -> Unit, ActionButton: @Composable () -> Unit, onAmountChanged: (Double) -> Unit, onSelectedAccountChanged: (Account) -> Unit, onToAccountChanged: (Account) -> Unit, onAddNewAccount: () -> Unit ) LongParameterList:EditTransactionScreen.kt$( screen: EditTransactionScreen, transactionType: TransactionType, baseCurrency: String, initialTitle: String?, titleSuggestions: ImmutableSet<String>, description: String?, category: Category?, dateTime: LocalDateTime?, account: Account?, toAccount: Account?, dueDate: LocalDateTime?, amount: Double, customExchangeRateState: CustomExchangeRateState, categories: ImmutableList<Category>, accounts: ImmutableList<Account>, onTitleChanged: (String?) -> Unit, onDescriptionChanged: (String?) -> Unit, onAmountChanged: (Double) -> Unit, onCategoryChanged: (Category?) -> Unit, onAccountChanged: (Account) -> Unit, onToAccountChanged: (Account) -> Unit, onDueDateChanged: (LocalDateTime?) -> Unit, onSetDate: (LocalDate) -> Unit, onSetTime: (LocalTime) -> Unit, onSetTransactionType: (TransactionType) -> Unit, onCreateCategory: (CreateCategoryData) -> Unit, onEditCategory: (Category) -> Unit, onPayPlannedPayment: () -> Unit, onSave: (closeScreen: Boolean) -> Unit, onSetHasChanges: (hasChanges: Boolean) -> Unit, onDelete: () -> Unit, onCreateAccount: (CreateAccountData) -> Unit, onExchangeRateChanged: (Double?) -> Unit = { }, loanData: EditTransactionDisplayLoan = EditTransactionDisplayLoan(), backgroundProcessing: Boolean = false, hasChanges: Boolean = false, ) - LongParameterList:HomeTab.kt$( hideBalance: Boolean, onSetExpanded: (Boolean) -> Unit, listState: LazyListState, period: TimePeriod, baseData: AppBaseData, upcoming: DueSection, overdue: DueSection, balance: BigDecimal, stats: IncomeExpensePair, history: ImmutableList<TransactionHistoryItem>, customerJourneyCards: ImmutableList<CustomerJourneyCardModel>, setUpcomingExpanded: (Boolean) -> Unit, setOverdueExpanded: (Boolean) -> Unit, onOpenMoreMenu: () -> Unit, onBalanceClick: () -> Unit, onPayOrGet: (Transaction) -> Unit, onDismiss: (CustomerJourneyCardModel) -> Unit, onHiddenBalanceClick: () -> Unit, onSkipTransaction: (Transaction) -> Unit, onSkipAllTransactions: (List<Transaction>) -> Unit, modifier: Modifier = Modifier ) + LongParameterList:HomeTab.kt$( hideBalance: Boolean, hideIncome: Boolean, onSetExpanded: (Boolean) -> Unit, listState: LazyListState, period: TimePeriod, baseData: AppBaseData, upcoming: DueSection, overdue: DueSection, balance: BigDecimal, stats: IncomeExpensePair, history: ImmutableList<TransactionHistoryItem>, customerJourneyCards: ImmutableList<CustomerJourneyCardModel>, setUpcomingExpanded: (Boolean) -> Unit, setOverdueExpanded: (Boolean) -> Unit, onOpenMoreMenu: () -> Unit, onBalanceClick: () -> Unit, onPayOrGet: (Transaction) -> Unit, onDismiss: (CustomerJourneyCardModel) -> Unit, onHiddenBalanceClick: () -> Unit, onHiddenIncomeClick: () -> Unit, onSkipTransaction: (Transaction) -> Unit, onSkipAllTransactions: (List<Transaction>) -> Unit, modifier: Modifier = Modifier ) LongParameterList:PlannedPaymentsLazyColumn.kt$( Header: @Composable () -> Unit, currency: String, categories: ImmutableList<Category>, accounts: ImmutableList<Account>, oneTime: ImmutableList<PlannedPaymentRule>, oneTimeIncome: Double, oneTimeExpenses: Double, recurring: ImmutableList<PlannedPaymentRule>, recurringIncome: Double, recurringExpenses: Double, oneTimeExpanded: Boolean, recurringExpanded: Boolean, setOneTimeExpanded: (Boolean) -> Unit, setRecurringExpanded: (Boolean) -> Unit, listState: LazyListState = rememberLazyListState() ) LongParameterList:PlannedPaymentsLazyColumn.kt$( nav: Navigation, currency: String, categories: ImmutableList<Category>, accounts: ImmutableList<Account>, listState: LazyListState, oneTime: ImmutableList<PlannedPaymentRule>, oneTimeIncome: Double, oneTimeExpenses: Double, oneTimeExpanded: Boolean, setOneTimeExpanded: (Boolean) -> Unit, recurring: ImmutableList<PlannedPaymentRule>, recurringIncome: Double, recurringExpenses: Double, recurringExpanded: Boolean, setRecurringExpanded: (Boolean) -> Unit ) LongParameterList:TransactionsScreen.kt$( history: ImmutableList<TransactionHistoryItem>, currency: String, baseCurrency: String, itemColor: Color, account: Account?, category: Category?, balance: Double, balanceBaseCurrency: Double?, income: Double, expenses: Double, onEdit: () -> Unit, onDelete: () -> Unit, onBalanceClick: () -> Unit, showCategoryModal: () -> Unit, showAccountModal: () -> Unit, treatTransfersAsIncomeExpense: Boolean = false, ) - LongParameterList:TransactionsScreen.kt$( period: TimePeriod, baseCurrency: String, currency: String, skipAllModalVisible: Boolean, onSkipAllModalVisible: (Boolean) -> Unit, account: Account?, category: Category?, accountNameConfirmation: TextFieldValue, updateAccountNameConfirmation: (String) -> Unit, enableDeletionButton: Boolean, categories: ImmutableList<Category>, accounts: ImmutableList<Account>, balance: Double, balanceBaseCurrency: Double?, income: Double, expenses: Double, choosePeriodModal: ChoosePeriodModalData?, history: ImmutableList<TransactionHistoryItem>, onPreviousMonth: () -> Unit, onNextMonth: () -> Unit, onSetPeriod: (TimePeriod) -> Unit, onEditAccount: (Account, Double) -> Unit, onEditCategory: (Category) -> Unit, onDelete: () -> Unit, deleteModal1Visible: Boolean, onDeleteModal1Visible: (Boolean) -> Unit, initWithTransactions: Boolean = false, treatTransfersAsIncomeExpense: Boolean = false, upcomingExpanded: Boolean = true, setUpcomingExpanded: (Boolean) -> Unit = {}, upcomingIncome: Double = 0.0, upcomingExpenses: Double = 0.0, upcoming: ImmutableList<Transaction> = persistentListOf(), overdueExpanded: Boolean = true, setOverdueExpanded: (Boolean) -> Unit = {}, overdueIncome: Double = 0.0, overdueExpenses: Double = 0.0, overdue: ImmutableList<Transaction> = persistentListOf(), onPayOrGet: (Transaction) -> Unit = {}, onSkipTransaction: (Transaction) -> Unit = {}, onSkipAllTransactions: (List<Transaction>) -> Unit = {}, onChoosePeriodModal: (ChoosePeriodModalData?) -> Unit ) - LoopWithTooManyJumpStatements:PieChart.kt$PieChartView$for + LongParameterList:TransactionsScreen.kt$( period: TimePeriod, baseCurrency: String, currency: String, skipAllModalVisible: Boolean, onSkipAllModalVisible: (Boolean) -> Unit, account: Account?, category: Category?, accountNameConfirmation: TextFieldValue, updateAccountNameConfirmation: (String) -> Unit, enableDeletionButton: Boolean, categories: ImmutableList<Category>, accounts: ImmutableList<Account>, balance: Double, balanceBaseCurrency: Double?, income: Double, expenses: Double, choosePeriodModal: ChoosePeriodModalData?, history: ImmutableList<TransactionHistoryItem>, onPreviousMonth: () -> Unit, onNextMonth: () -> Unit, onSetPeriod: (TimePeriod) -> Unit, onEditAccount: (Account, Double) -> Unit, onEditCategory: (Category) -> Unit, onDelete: () -> Unit, deleteModal1Visible: Boolean, onDeleteModal1Visible: (Boolean) -> Unit, initWithTransactions: Boolean = false, treatTransfersAsIncomeExpense: Boolean = false, upcomingExpanded: Boolean = true, setUpcomingExpanded: (Boolean) -> Unit = {}, upcomingIncome: Double = 0.0, upcomingExpenses: Double = 0.0, upcoming: ImmutableList<Transaction> = persistentListOf(), overdueExpanded: Boolean = true, setOverdueExpanded: (Boolean) -> Unit = {}, overdueIncome: Double = 0.0, overdueExpenses: Double = 0.0, overdue: ImmutableList<Transaction> = persistentListOf(), onPayOrGet: (Transaction) -> Unit = {}, onSkipTransaction: (Transaction) -> Unit = {}, onSkipAllTransactions: (List<Transaction>) -> Unit = {}, onChoosePeriodModal: (ChoosePeriodModalData?) -> Unit ) LoopWithTooManyJumpStatements:PieChart.kt$PieChartView$for MagicNumber:AmountFormatting.kt$0.009 MagicNumber:AmountFormatting.kt$9 MagicNumber:BackBottomBar.kt$180f diff --git a/ivy-base/build.gradle.kts b/ivy-base/build.gradle.kts index 2ade5f4b93..384241f3c8 100644 --- a/ivy-base/build.gradle.kts +++ b/ivy-base/build.gradle.kts @@ -4,4 +4,4 @@ plugins { android { namespace = "com.ivy.base" -} \ No newline at end of file +} diff --git a/ivy-base/src/main/java/com/ivy/base/di/KotlinxSerializationModule.kt b/ivy-base/src/main/java/com/ivy/base/di/KotlinxSerializationModule.kt index 1bea2432cc..fec480af14 100644 --- a/ivy-base/src/main/java/com/ivy/base/di/KotlinxSerializationModule.kt +++ b/ivy-base/src/main/java/com/ivy/base/di/KotlinxSerializationModule.kt @@ -16,4 +16,4 @@ object KotlinxSerializationModule { isLenient = true } } -} \ No newline at end of file +} diff --git a/ivy-base/src/main/java/com/ivy/base/exact/ExactDsl.kt b/ivy-base/src/main/java/com/ivy/base/exact/ExactDsl.kt index ab4d4f491a..0de04b97d7 100644 --- a/ivy-base/src/main/java/com/ivy/base/exact/ExactDsl.kt +++ b/ivy-base/src/main/java/com/ivy/base/exact/ExactDsl.kt @@ -18,4 +18,4 @@ interface Exact { ifLeft = { throw ExactError(it) }, ifRight = { it }, ) -} \ No newline at end of file +} diff --git a/ivy-base/src/main/java/com/ivy/base/legacy/GlobalUtils.kt b/ivy-base/src/main/java/com/ivy/base/legacy/GlobalUtils.kt index 14a2d54ade..c18c5249c0 100644 --- a/ivy-base/src/main/java/com/ivy/base/legacy/GlobalUtils.kt +++ b/ivy-base/src/main/java/com/ivy/base/legacy/GlobalUtils.kt @@ -33,4 +33,4 @@ fun refreshWidget(widgetReceiver: Class<*>) { updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids) appContext.sendBroadcast(updateIntent) -} \ No newline at end of file +} diff --git a/ivy-base/src/main/java/com/ivy/base/legacy/Theme.kt b/ivy-base/src/main/java/com/ivy/base/legacy/Theme.kt index 8f9ab723c2..ab99ea0c7e 100644 --- a/ivy-base/src/main/java/com/ivy/base/legacy/Theme.kt +++ b/ivy-base/src/main/java/com/ivy/base/legacy/Theme.kt @@ -5,5 +5,5 @@ import androidx.compose.runtime.Immutable @Deprecated("Old design system. Use `:ivy-design` and Material3") @Immutable enum class Theme { - LIGHT, DARK, AUTO; + LIGHT, DARK, AUTO } diff --git a/ivy-common-ui/build.gradle.kts b/ivy-common-ui/build.gradle.kts index 252c40b216..c0479c521e 100644 --- a/ivy-common-ui/build.gradle.kts +++ b/ivy-common-ui/build.gradle.kts @@ -13,4 +13,4 @@ dependencies { implementation(projects.ivyNavigation) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/ivy-data-testing/build.gradle.kts b/ivy-data-testing/build.gradle.kts index 53a671015b..f8006d01be 100644 --- a/ivy-data-testing/build.gradle.kts +++ b/ivy-data-testing/build.gradle.kts @@ -16,4 +16,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/ivy-data-testing/src/main/java/com/ivy/data/testing/FakeAccountRepository.kt b/ivy-data-testing/src/main/java/com/ivy/data/testing/FakeAccountRepository.kt index 56a0b4e889..12b6cc47da 100644 --- a/ivy-data-testing/src/main/java/com/ivy/data/testing/FakeAccountRepository.kt +++ b/ivy-data-testing/src/main/java/com/ivy/data/testing/FakeAccountRepository.kt @@ -44,4 +44,4 @@ class FakeAccountRepository : AccountRepository { override suspend fun deleteAll() { accountsMap.clear() } -} \ No newline at end of file +} diff --git a/ivy-data-testing/src/main/java/com/ivy/data/testing/FakeCategoryRepository.kt b/ivy-data-testing/src/main/java/com/ivy/data/testing/FakeCategoryRepository.kt index 2bb2336659..1a07d0a9ea 100644 --- a/ivy-data-testing/src/main/java/com/ivy/data/testing/FakeCategoryRepository.kt +++ b/ivy-data-testing/src/main/java/com/ivy/data/testing/FakeCategoryRepository.kt @@ -49,4 +49,4 @@ class FakeCategoryRepository : CategoryRepository { override suspend fun deleteAll() { categories.clear() } -} \ No newline at end of file +} diff --git a/ivy-data-testing/src/test/java/com/ivy/data/testing/FakeAccountRepositoryTest.kt b/ivy-data-testing/src/test/java/com/ivy/data/testing/FakeAccountRepositoryTest.kt index 3395b483ed..ffe1a3d342 100644 --- a/ivy-data-testing/src/test/java/com/ivy/data/testing/FakeAccountRepositoryTest.kt +++ b/ivy-data-testing/src/test/java/com/ivy/data/testing/FakeAccountRepositoryTest.kt @@ -416,4 +416,4 @@ class FakeAccountRepositoryTest : FreeSpec({ notDeleted shouldBe emptyList() deleted shouldBe emptyList() } -}) \ No newline at end of file +}) diff --git a/ivy-data-testing/src/test/java/com/ivy/data/testing/FakeCategoryRepositoryTest.kt b/ivy-data-testing/src/test/java/com/ivy/data/testing/FakeCategoryRepositoryTest.kt index 097c2db918..073a3ae998 100644 --- a/ivy-data-testing/src/test/java/com/ivy/data/testing/FakeCategoryRepositoryTest.kt +++ b/ivy-data-testing/src/test/java/com/ivy/data/testing/FakeCategoryRepositoryTest.kt @@ -448,4 +448,4 @@ class FakeCategoryRepositoryTest : FreeSpec({ notDeleted shouldBe emptyList() deleted shouldBe emptyList() } -}) \ No newline at end of file +}) diff --git a/ivy-data/build.gradle.kts b/ivy-data/build.gradle.kts index 11eec61dc5..1fc08123e3 100644 --- a/ivy-data/build.gradle.kts +++ b/ivy-data/build.gradle.kts @@ -12,4 +12,4 @@ dependencies { implementation(libs.datastore) implementation(libs.bundles.ktor) -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/datastore/DatastoreKeys.kt b/ivy-data/src/main/java/com/ivy/data/datastore/DatastoreKeys.kt index 821bb42548..5873899c57 100644 --- a/ivy-data/src/main/java/com/ivy/data/datastore/DatastoreKeys.kt +++ b/ivy-data/src/main/java/com/ivy/data/datastore/DatastoreKeys.kt @@ -22,4 +22,4 @@ object DatastoreKeys { fun ivyFeature(key: String): Preferences.Key { return booleanPreferencesKey("feature_$key") } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/db/IvyRoomDatabase.kt b/ivy-data/src/main/java/com/ivy/data/db/IvyRoomDatabase.kt index 4d8c6e8c63..781640b9d7 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/IvyRoomDatabase.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/IvyRoomDatabase.kt @@ -3,7 +3,25 @@ package com.ivy.data.db import android.content.Context import androidx.room.* import androidx.room.migration.AutoMigrationSpec -import com.ivy.domain.db.RoomTypeConverters +import com.ivy.data.db.dao.read.AccountDao +import com.ivy.data.db.dao.read.BudgetDao +import com.ivy.data.db.dao.read.CategoryDao +import com.ivy.data.db.dao.read.ExchangeRatesDao +import com.ivy.data.db.dao.read.LoanDao +import com.ivy.data.db.dao.read.LoanRecordDao +import com.ivy.data.db.dao.read.PlannedPaymentRuleDao +import com.ivy.data.db.dao.read.SettingsDao +import com.ivy.data.db.dao.read.TransactionDao +import com.ivy.data.db.dao.read.UserDao +import com.ivy.data.db.dao.write.WriteAccountDao +import com.ivy.data.db.dao.write.WriteBudgetDao +import com.ivy.data.db.dao.write.WriteCategoryDao +import com.ivy.data.db.dao.write.WriteExchangeRatesDao +import com.ivy.data.db.dao.write.WriteLoanDao +import com.ivy.data.db.dao.write.WriteLoanRecordDao +import com.ivy.data.db.dao.write.WritePlannedPaymentRuleDao +import com.ivy.data.db.dao.write.WriteSettingsDao +import com.ivy.data.db.dao.write.WriteTransactionDao import com.ivy.data.db.entity.AccountEntity import com.ivy.data.db.entity.BudgetEntity import com.ivy.data.db.entity.CategoryEntity @@ -14,6 +32,7 @@ import com.ivy.data.db.entity.PlannedPaymentRuleEntity import com.ivy.data.db.entity.SettingsEntity import com.ivy.data.db.entity.TransactionEntity import com.ivy.data.db.entity.UserEntity +import com.ivy.domain.db.RoomTypeConverters import com.ivy.domain.db.migration.Migration105to106_TrnRecurringRules import com.ivy.domain.db.migration.Migration106to107_Wishlist import com.ivy.domain.db.migration.Migration107to108_Sync @@ -31,25 +50,6 @@ import com.ivy.domain.db.migration.Migration118to119_Loans import com.ivy.domain.db.migration.Migration119to120_LoanTransactions import com.ivy.domain.db.migration.Migration120to121_DropWishlistItem import com.ivy.domain.db.migration.Migration122to123_ExchangeRates -import com.ivy.data.db.dao.read.AccountDao -import com.ivy.data.db.dao.read.BudgetDao -import com.ivy.data.db.dao.read.CategoryDao -import com.ivy.data.db.dao.read.ExchangeRatesDao -import com.ivy.data.db.dao.read.LoanDao -import com.ivy.data.db.dao.read.LoanRecordDao -import com.ivy.data.db.dao.read.PlannedPaymentRuleDao -import com.ivy.data.db.dao.read.SettingsDao -import com.ivy.data.db.dao.read.TransactionDao -import com.ivy.data.db.dao.read.UserDao -import com.ivy.data.db.dao.write.WriteAccountDao -import com.ivy.data.db.dao.write.WriteBudgetDao -import com.ivy.data.db.dao.write.WriteCategoryDao -import com.ivy.data.db.dao.write.WriteExchangeRatesDao -import com.ivy.data.db.dao.write.WriteLoanDao -import com.ivy.data.db.dao.write.WriteLoanRecordDao -import com.ivy.data.db.dao.write.WritePlannedPaymentRuleDao -import com.ivy.data.db.dao.write.WriteSettingsDao -import com.ivy.data.db.dao.write.WriteTransactionDao @Database( entities = [ diff --git a/ivy-data/src/main/java/com/ivy/data/db/RoomTypeConverters.kt b/ivy-data/src/main/java/com/ivy/data/db/RoomTypeConverters.kt index 5ace50c1b4..898a897f4d 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/RoomTypeConverters.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/RoomTypeConverters.kt @@ -4,9 +4,9 @@ import androidx.room.TypeConverter import com.ivy.base.legacy.Theme import com.ivy.base.legacy.epochMilliToDateTime import com.ivy.base.legacy.toEpochMilli +import com.ivy.base.model.TransactionType import com.ivy.data.model.IntervalType import com.ivy.data.model.LoanType -import com.ivy.base.model.TransactionType import java.time.LocalDateTime import java.util.* diff --git a/ivy-data/src/main/java/com/ivy/data/db/dao/read/TransactionDao.kt b/ivy-data/src/main/java/com/ivy/data/db/dao/read/TransactionDao.kt index 8e4892ccf2..55139c3e6d 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/dao/read/TransactionDao.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/dao/read/TransactionDao.kt @@ -2,8 +2,8 @@ package com.ivy.data.db.dao.read import androidx.room.Dao import androidx.room.Query -import com.ivy.data.db.entity.TransactionEntity import com.ivy.base.model.TransactionType +import com.ivy.data.db.entity.TransactionEntity import java.time.LocalDateTime import java.util.* diff --git a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteAccountDao.kt b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteAccountDao.kt index 83b6068ec1..81016c2c2b 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteAccountDao.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteAccountDao.kt @@ -22,4 +22,4 @@ interface WriteAccountDao { @Query("DELETE FROM accounts") suspend fun deleteAll() -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteBudgetDao.kt b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteBudgetDao.kt index 8a68754061..fd594893dd 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteBudgetDao.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteBudgetDao.kt @@ -22,4 +22,4 @@ interface WriteBudgetDao { @Query("DELETE FROM budgets") suspend fun deleteAll() -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteCategoryDao.kt b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteCategoryDao.kt index d221e611b8..f83209c371 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteCategoryDao.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteCategoryDao.kt @@ -22,4 +22,4 @@ interface WriteCategoryDao { @Query("DELETE FROM categories") suspend fun deleteAll() -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteExchangeRatesDao.kt b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteExchangeRatesDao.kt index 2e73852294..a48552d9e8 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteExchangeRatesDao.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteExchangeRatesDao.kt @@ -21,4 +21,4 @@ interface WriteExchangeRatesDao { @Query("DELETE FROM exchange_rates") suspend fun deleteALl() -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteLoanDao.kt b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteLoanDao.kt index 182a1d0e44..5936dc4328 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteLoanDao.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteLoanDao.kt @@ -22,4 +22,4 @@ interface WriteLoanDao { @Query("DELETE FROM loans") suspend fun deleteAll() -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteLoanRecordDao.kt b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteLoanRecordDao.kt index 7497500c33..a2e3627894 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteLoanRecordDao.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteLoanRecordDao.kt @@ -22,4 +22,4 @@ interface WriteLoanRecordDao { @Query("DELETE FROM loan_records") suspend fun deleteAll() -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WritePlannedPaymentRuleDao.kt b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WritePlannedPaymentRuleDao.kt index da503b1ac9..77ba5ea4ae 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WritePlannedPaymentRuleDao.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WritePlannedPaymentRuleDao.kt @@ -25,4 +25,4 @@ interface WritePlannedPaymentRuleDao { @Query("DELETE FROM planned_payment_rules") suspend fun deleteAll() -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteSettingsDao.kt b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteSettingsDao.kt index 41ce49f620..8ff786e897 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteSettingsDao.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteSettingsDao.kt @@ -19,4 +19,4 @@ interface WriteSettingsDao { @Query("DELETE FROM settings") suspend fun deleteAll() -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteTransactionDao.kt b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteTransactionDao.kt index c98030664c..06b916ac20 100644 --- a/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteTransactionDao.kt +++ b/ivy-data/src/main/java/com/ivy/data/db/dao/write/WriteTransactionDao.kt @@ -19,7 +19,7 @@ interface WriteTransactionDao { @Query( "UPDATE transactions SET isDeleted = 1, isSynced = 0 WHERE" + - " recurringRuleId = :recurringRuleId AND dateTime IS NULL" + " recurringRuleId = :recurringRuleId AND dateTime IS NULL" ) suspend fun flagDeletedByRecurringRuleIdAndNoDateTime(recurringRuleId: UUID) @@ -34,4 +34,4 @@ interface WriteTransactionDao { @Query("DELETE FROM transactions") suspend fun deleteAll() -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/di/DatastoreModule.kt b/ivy-data/src/main/java/com/ivy/data/di/DatastoreModule.kt index 46a858f51f..ed6e9eebd6 100644 --- a/ivy-data/src/main/java/com/ivy/data/di/DatastoreModule.kt +++ b/ivy-data/src/main/java/com/ivy/data/di/DatastoreModule.kt @@ -20,4 +20,4 @@ object DatastoreModule { ): DataStore { return context.dataStore } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/di/RepositoryBindingsModule.kt b/ivy-data/src/main/java/com/ivy/data/di/RepositoryBindingsModule.kt index 9ab449b044..565e8bf68f 100644 --- a/ivy-data/src/main/java/com/ivy/data/di/RepositoryBindingsModule.kt +++ b/ivy-data/src/main/java/com/ivy/data/di/RepositoryBindingsModule.kt @@ -12,4 +12,4 @@ import dagger.hilt.components.SingletonComponent abstract class RepositoryBindingsModule { @Binds abstract fun bindAccountRepository(repo: AccountRepositoryImpl): AccountRepository -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/di/RoomDbModule.kt b/ivy-data/src/main/java/com/ivy/data/di/RoomDbModule.kt index d60445ca9d..ba6d4cbc5d 100644 --- a/ivy-data/src/main/java/com/ivy/data/di/RoomDbModule.kt +++ b/ivy-data/src/main/java/com/ivy/data/di/RoomDbModule.kt @@ -138,4 +138,4 @@ object RoomDbModule { fun provideWriteExchangeRatesDao(db: IvyRoomDatabase): WriteExchangeRatesDao { return db.writeExchangeRatesDao } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/model/Account.kt b/ivy-data/src/main/java/com/ivy/data/model/Account.kt index b81189d4d4..a100e59947 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/Account.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/Account.kt @@ -23,4 +23,4 @@ data class Account( override val orderNum: Double, override val lastUpdated: Instant, override val removed: Boolean, -) : Syncable, Reorderable \ No newline at end of file +) : Syncable, Reorderable diff --git a/ivy-data/src/main/java/com/ivy/data/model/Category.kt b/ivy-data/src/main/java/com/ivy/data/model/Category.kt index a8d73557e8..a94138b512 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/Category.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/Category.kt @@ -20,4 +20,4 @@ data class Category( override val orderNum: Double, override val lastUpdated: Instant, override val removed: Boolean, -) : Syncable, Reorderable \ No newline at end of file +) : Syncable, Reorderable diff --git a/ivy-data/src/main/java/com/ivy/data/model/Transaction.kt b/ivy-data/src/main/java/com/ivy/data/model/Transaction.kt index f98869d7d7..5c59f41b63 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/Transaction.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/Transaction.kt @@ -68,4 +68,4 @@ data class TransactionMetadata( val loanId: UUID? = null, // This refers to the loan record id that is linked with a transaction val loanRecordId: UUID, -) \ No newline at end of file +) diff --git a/ivy-data/src/main/java/com/ivy/data/model/common/Reorderable.kt b/ivy-data/src/main/java/com/ivy/data/model/common/Reorderable.kt index b0a4f31b46..7a662d01aa 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/common/Reorderable.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/common/Reorderable.kt @@ -6,4 +6,4 @@ package com.ivy.data.model.common */ interface Reorderable { val orderNum: Double -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/model/common/Value.kt b/ivy-data/src/main/java/com/ivy/data/model/common/Value.kt index 1f4776e435..9bfe4136fd 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/common/Value.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/common/Value.kt @@ -9,4 +9,4 @@ import com.ivy.data.model.primitive.PositiveDouble data class Value( val amount: PositiveDouble, val asset: AssetCode, -) \ No newline at end of file +) diff --git a/ivy-data/src/main/java/com/ivy/data/model/primitive/AssetCode.kt b/ivy-data/src/main/java/com/ivy/data/model/primitive/AssetCode.kt index 6ec7184042..78505290d3 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/primitive/AssetCode.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/primitive/AssetCode.kt @@ -12,6 +12,5 @@ value class AssetCode private constructor(val code: String) { val notBlankTrimmed = NotBlankTrimmedString.from(raw).bind() return AssetCode(notBlankTrimmed.value.uppercase()) } - } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/model/primitive/ColorInt.kt b/ivy-data/src/main/java/com/ivy/data/model/primitive/ColorInt.kt index c36bf381ea..b7b328bf90 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/primitive/ColorInt.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/primitive/ColorInt.kt @@ -1,4 +1,4 @@ package com.ivy.data.model.primitive @JvmInline -value class ColorInt(val value: Int) \ No newline at end of file +value class ColorInt(val value: Int) diff --git a/ivy-data/src/main/java/com/ivy/data/model/primitive/IconAsset.kt b/ivy-data/src/main/java/com/ivy/data/model/primitive/IconAsset.kt index 3c792b85b7..27fe8b79e2 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/primitive/IconAsset.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/primitive/IconAsset.kt @@ -15,4 +15,4 @@ value class IconAsset private constructor(val id: String) { return IconAsset(notBlankTrimmed.lowercase()) } } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/model/primitive/NotBlankTrimmedString.kt b/ivy-data/src/main/java/com/ivy/data/model/primitive/NotBlankTrimmedString.kt index 130de9056e..37b33a7c7e 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/primitive/NotBlankTrimmedString.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/primitive/NotBlankTrimmedString.kt @@ -15,4 +15,4 @@ value class NotBlankTrimmedString private constructor(val value: String) { return NotBlankTrimmedString(trimmed) } } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/model/primitive/PositiveDouble.kt b/ivy-data/src/main/java/com/ivy/data/model/primitive/PositiveDouble.kt index e657e8871a..66f80067a2 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/primitive/PositiveDouble.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/primitive/PositiveDouble.kt @@ -18,6 +18,5 @@ value class PositiveDouble private constructor(val value: Double) { } return PositiveDouble(raw) } - } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/model/sync/Syncable.kt b/ivy-data/src/main/java/com/ivy/data/model/sync/Syncable.kt index d455a28b48..442ad00c75 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/sync/Syncable.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/sync/Syncable.kt @@ -10,4 +10,4 @@ interface Syncable { * Tombstone flag */ val removed: Boolean -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/model/sync/UniqueId.kt b/ivy-data/src/main/java/com/ivy/data/model/sync/UniqueId.kt index 11f2ab8254..a84b09554a 100644 --- a/ivy-data/src/main/java/com/ivy/data/model/sync/UniqueId.kt +++ b/ivy-data/src/main/java/com/ivy/data/model/sync/UniqueId.kt @@ -4,4 +4,4 @@ import java.util.UUID interface UniqueId { val value: UUID -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/repository/AccountRepository.kt b/ivy-data/src/main/java/com/ivy/data/repository/AccountRepository.kt index d814c030d3..39e79a6c91 100644 --- a/ivy-data/src/main/java/com/ivy/data/repository/AccountRepository.kt +++ b/ivy-data/src/main/java/com/ivy/data/repository/AccountRepository.kt @@ -13,4 +13,4 @@ interface AccountRepository { suspend fun flagDeleted(id: AccountId) suspend fun deleteById(id: AccountId) suspend fun deleteAll() -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/repository/CategoryRepository.kt b/ivy-data/src/main/java/com/ivy/data/repository/CategoryRepository.kt index 1f2c152b0e..c206f03c50 100644 --- a/ivy-data/src/main/java/com/ivy/data/repository/CategoryRepository.kt +++ b/ivy-data/src/main/java/com/ivy/data/repository/CategoryRepository.kt @@ -12,4 +12,4 @@ interface CategoryRepository { suspend fun deleteById(id: CategoryId) suspend fun flagDeleted(id: CategoryId) suspend fun deleteAll() -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/repository/impl/AccountRepositoryImpl.kt b/ivy-data/src/main/java/com/ivy/data/repository/impl/AccountRepositoryImpl.kt index 2189956775..067aab1e54 100644 --- a/ivy-data/src/main/java/com/ivy/data/repository/impl/AccountRepositoryImpl.kt +++ b/ivy-data/src/main/java/com/ivy/data/repository/impl/AccountRepositoryImpl.kt @@ -68,4 +68,4 @@ class AccountRepositoryImpl @Inject constructor( dataSource.deleteAll() } } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/repository/impl/CategoryRepositoryImpl.kt b/ivy-data/src/main/java/com/ivy/data/repository/impl/CategoryRepositoryImpl.kt index a7ca4bc202..2a9b42b11f 100644 --- a/ivy-data/src/main/java/com/ivy/data/repository/impl/CategoryRepositoryImpl.kt +++ b/ivy-data/src/main/java/com/ivy/data/repository/impl/CategoryRepositoryImpl.kt @@ -68,4 +68,4 @@ class CategoryRepositoryImpl @Inject constructor( dataSource.deleteAll() } } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/repository/impl/TransactionRepositoryImpl.kt b/ivy-data/src/main/java/com/ivy/data/repository/impl/TransactionRepositoryImpl.kt index fa13501c75..be32709da7 100644 --- a/ivy-data/src/main/java/com/ivy/data/repository/impl/TransactionRepositoryImpl.kt +++ b/ivy-data/src/main/java/com/ivy/data/repository/impl/TransactionRepositoryImpl.kt @@ -4,4 +4,4 @@ import javax.inject.Inject class TransactionRepositoryImpl @Inject constructor() { // TODO: Implement -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/repository/mapper/AccountMapper.kt b/ivy-data/src/main/java/com/ivy/data/repository/mapper/AccountMapper.kt index 8336753eb6..0258d293c1 100644 --- a/ivy-data/src/main/java/com/ivy/data/repository/mapper/AccountMapper.kt +++ b/ivy-data/src/main/java/com/ivy/data/repository/mapper/AccountMapper.kt @@ -40,4 +40,4 @@ class AccountMapper @Inject constructor() { isSynced = true, // TODO: Delete this ) } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/repository/mapper/CategoryMapper.kt b/ivy-data/src/main/java/com/ivy/data/repository/mapper/CategoryMapper.kt index dc87819b4d..20f71f081e 100644 --- a/ivy-data/src/main/java/com/ivy/data/repository/mapper/CategoryMapper.kt +++ b/ivy-data/src/main/java/com/ivy/data/repository/mapper/CategoryMapper.kt @@ -37,4 +37,4 @@ class CategoryMapper @Inject constructor() { id = id.value ) } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/source/LocalAccountDataSource.kt b/ivy-data/src/main/java/com/ivy/data/source/LocalAccountDataSource.kt index 191c4ecf80..32567b82ad 100644 --- a/ivy-data/src/main/java/com/ivy/data/source/LocalAccountDataSource.kt +++ b/ivy-data/src/main/java/com/ivy/data/source/LocalAccountDataSource.kt @@ -41,4 +41,4 @@ class LocalAccountDataSource @Inject constructor( suspend fun deleteAll() { writeAccountDao.deleteAll() } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/source/LocalCategoryDataSource.kt b/ivy-data/src/main/java/com/ivy/data/source/LocalCategoryDataSource.kt index c2b1a583ce..bc57933de8 100644 --- a/ivy-data/src/main/java/com/ivy/data/source/LocalCategoryDataSource.kt +++ b/ivy-data/src/main/java/com/ivy/data/source/LocalCategoryDataSource.kt @@ -41,4 +41,4 @@ class LocalCategoryDataSource @Inject constructor( suspend fun deleteAll() { writeCategoryDao.deleteAll() } -} \ No newline at end of file +} diff --git a/ivy-data/src/main/java/com/ivy/data/source/LocalTransactionDataSource.kt b/ivy-data/src/main/java/com/ivy/data/source/LocalTransactionDataSource.kt index 1ca7d97ca4..dd5a6d68a5 100644 --- a/ivy-data/src/main/java/com/ivy/data/source/LocalTransactionDataSource.kt +++ b/ivy-data/src/main/java/com/ivy/data/source/LocalTransactionDataSource.kt @@ -4,4 +4,4 @@ import javax.inject.Inject class LocalTransactionDataSource @Inject constructor() { // TODO: Implement -} \ No newline at end of file +} diff --git a/ivy-data/src/test/java/com/ivy/data/model/primitive/AssetCodeTest.kt b/ivy-data/src/test/java/com/ivy/data/model/primitive/AssetCodeTest.kt index 82558ba340..329aca91be 100644 --- a/ivy-data/src/test/java/com/ivy/data/model/primitive/AssetCodeTest.kt +++ b/ivy-data/src/test/java/com/ivy/data/model/primitive/AssetCodeTest.kt @@ -22,4 +22,4 @@ class AssetCodeTest : FreeSpec({ // then res.shouldBeRight() shouldBe AssetCode("USD") } -}) \ No newline at end of file +}) diff --git a/ivy-data/src/test/java/com/ivy/data/model/primitive/IconIdTest.kt b/ivy-data/src/test/java/com/ivy/data/model/primitive/IconIdTest.kt index bbb2e8a139..9477ea4d16 100644 --- a/ivy-data/src/test/java/com/ivy/data/model/primitive/IconIdTest.kt +++ b/ivy-data/src/test/java/com/ivy/data/model/primitive/IconIdTest.kt @@ -26,4 +26,4 @@ class IconIdTest : FreeSpec({ // then res.shouldBeRight() shouldBe IconAsset("icon") } -}) \ No newline at end of file +}) diff --git a/ivy-data/src/test/java/com/ivy/data/model/primitive/NotBlankTrimmedStringTest.kt b/ivy-data/src/test/java/com/ivy/data/model/primitive/NotBlankTrimmedStringTest.kt index 6d2276f6e7..46af45a769 100644 --- a/ivy-data/src/test/java/com/ivy/data/model/primitive/NotBlankTrimmedStringTest.kt +++ b/ivy-data/src/test/java/com/ivy/data/model/primitive/NotBlankTrimmedStringTest.kt @@ -22,4 +22,4 @@ class NotBlankTrimmedStringTest : FreeSpec({ // then res.shouldBeRight() shouldBe NotBlankTrimmedString("abc") } -}) \ No newline at end of file +}) diff --git a/ivy-data/src/test/java/com/ivy/data/model/primitive/PositiveDoubleTest.kt b/ivy-data/src/test/java/com/ivy/data/model/primitive/PositiveDoubleTest.kt index 4d281ff256..e73180cc4d 100644 --- a/ivy-data/src/test/java/com/ivy/data/model/primitive/PositiveDoubleTest.kt +++ b/ivy-data/src/test/java/com/ivy/data/model/primitive/PositiveDoubleTest.kt @@ -31,4 +31,4 @@ class PositiveDoubleTest : FreeSpec({ // then res.shouldBeRight() shouldBe PositiveDouble(42.0) } -}) \ No newline at end of file +}) diff --git a/ivy-data/src/test/java/com/ivy/data/repository/impl/AccountRepositoryImplTest.kt b/ivy-data/src/test/java/com/ivy/data/repository/impl/AccountRepositoryImplTest.kt index 63568b263d..14c7dd0fcd 100644 --- a/ivy-data/src/test/java/com/ivy/data/repository/impl/AccountRepositoryImplTest.kt +++ b/ivy-data/src/test/java/com/ivy/data/repository/impl/AccountRepositoryImplTest.kt @@ -395,4 +395,4 @@ class AccountRepositoryImplTest : FreeSpec({ dataSource.deleteAll() } } -}) \ No newline at end of file +}) diff --git a/ivy-data/src/test/java/com/ivy/data/repository/impl/CategoryRepositoryImplTest.kt b/ivy-data/src/test/java/com/ivy/data/repository/impl/CategoryRepositoryImplTest.kt index 38e43d6d93..a326db1341 100644 --- a/ivy-data/src/test/java/com/ivy/data/repository/impl/CategoryRepositoryImplTest.kt +++ b/ivy-data/src/test/java/com/ivy/data/repository/impl/CategoryRepositoryImplTest.kt @@ -347,4 +347,4 @@ class CategoryRepositoryImplTest : FreeSpec({ dataSource.deleteAll() } } -}) \ No newline at end of file +}) diff --git a/ivy-data/src/test/java/com/ivy/data/repository/mapper/AccountMapperTest.kt b/ivy-data/src/test/java/com/ivy/data/repository/mapper/AccountMapperTest.kt index 45d38864a2..93aaba19ba 100644 --- a/ivy-data/src/test/java/com/ivy/data/repository/mapper/AccountMapperTest.kt +++ b/ivy-data/src/test/java/com/ivy/data/repository/mapper/AccountMapperTest.kt @@ -113,4 +113,4 @@ class AccountMapperTest : FreeSpec({ result.shouldBeRight() } } -}) \ No newline at end of file +}) diff --git a/ivy-data/src/test/java/com/ivy/data/repository/mapper/CategoryMapperTest.kt b/ivy-data/src/test/java/com/ivy/data/repository/mapper/CategoryMapperTest.kt index a1ef2da3bc..45c27208fb 100644 --- a/ivy-data/src/test/java/com/ivy/data/repository/mapper/CategoryMapperTest.kt +++ b/ivy-data/src/test/java/com/ivy/data/repository/mapper/CategoryMapperTest.kt @@ -95,4 +95,4 @@ class CategoryMapperTest : FreeSpec({ res.shouldBeRight() } } -}) \ No newline at end of file +}) diff --git a/ivy-design/build.gradle.kts b/ivy-design/build.gradle.kts index e6740807d7..b89588ab65 100644 --- a/ivy-design/build.gradle.kts +++ b/ivy-design/build.gradle.kts @@ -8,4 +8,4 @@ android { dependencies { implementation(projects.ivyResources) -} \ No newline at end of file +} diff --git a/ivy-design/src/main/java/com/ivy/design/system/IvyMaterial3Theme.kt b/ivy-design/src/main/java/com/ivy/design/system/IvyMaterial3Theme.kt index cefaa64601..bf646fb29d 100644 --- a/ivy-design/src/main/java/com/ivy/design/system/IvyMaterial3Theme.kt +++ b/ivy-design/src/main/java/com/ivy/design/system/IvyMaterial3Theme.kt @@ -84,4 +84,4 @@ private fun ivyDarkColorScheme(): ColorScheme = ColorScheme( outline = IvyColors.Gray, outlineVariant = IvyColors.LightGray, scrim = IvyColors.ExtraLightGray.copy(alpha = 0.8f) -) \ No newline at end of file +) diff --git a/ivy-design/src/main/java/com/ivy/design/system/colors/ColorShades.kt b/ivy-design/src/main/java/com/ivy/design/system/colors/ColorShades.kt index 496d82a0b5..60506493c9 100644 --- a/ivy-design/src/main/java/com/ivy/design/system/colors/ColorShades.kt +++ b/ivy-design/src/main/java/com/ivy/design/system/colors/ColorShades.kt @@ -10,4 +10,4 @@ data class ColorShades( val kindaDark: Color, val dark: Color, val extraDark: Color, -) \ No newline at end of file +) diff --git a/ivy-design/src/main/java/com/ivy/design/system/colors/IvyColors.kt b/ivy-design/src/main/java/com/ivy/design/system/colors/IvyColors.kt index 4c718fba38..53ba0bccb3 100644 --- a/ivy-design/src/main/java/com/ivy/design/system/colors/IvyColors.kt +++ b/ivy-design/src/main/java/com/ivy/design/system/colors/IvyColors.kt @@ -77,4 +77,3 @@ object IvyColors { extraDark = Color(0xFF521433), ) } - diff --git a/ivy-domain/build.gradle.kts b/ivy-domain/build.gradle.kts index 66a6b27da2..3190d31396 100644 --- a/ivy-domain/build.gradle.kts +++ b/ivy-domain/build.gradle.kts @@ -11,4 +11,4 @@ dependencies { implementation(projects.ivyData) implementation(libs.datastore) // TODO: Will be removed -} \ No newline at end of file +} diff --git a/ivy-domain/src/main/java/com/ivy/domain/AppStarter.kt b/ivy-domain/src/main/java/com/ivy/domain/AppStarter.kt index afc9fec382..b8d0ea7bdf 100644 --- a/ivy-domain/src/main/java/com/ivy/domain/AppStarter.kt +++ b/ivy-domain/src/main/java/com/ivy/domain/AppStarter.kt @@ -10,4 +10,4 @@ interface AppStarter { fun getRootIntent(): Intent fun defaultStart() fun addTransactionStart(type: TransactionType) -} \ No newline at end of file +} diff --git a/ivy-domain/src/main/java/com/ivy/domain/ComposeViewModel.kt b/ivy-domain/src/main/java/com/ivy/domain/ComposeViewModel.kt index a965989b01..b2187cfaae 100644 --- a/ivy-domain/src/main/java/com/ivy/domain/ComposeViewModel.kt +++ b/ivy-domain/src/main/java/com/ivy/domain/ComposeViewModel.kt @@ -20,4 +20,4 @@ abstract class ComposeViewModel : ViewModel() { * in the UI to be processed in the ViewModel. */ abstract fun onEvent(event: UiEvent) -} \ No newline at end of file +} diff --git a/ivy-domain/src/main/java/com/ivy/domain/RootScreen.kt b/ivy-domain/src/main/java/com/ivy/domain/RootScreen.kt index 7bf952b400..cc26001231 100644 --- a/ivy-domain/src/main/java/com/ivy/domain/RootScreen.kt +++ b/ivy-domain/src/main/java/com/ivy/domain/RootScreen.kt @@ -31,4 +31,4 @@ interface RootScreen { fun openGooglePlayAppPage(appId: String) fun pinWidget(widget: Class) -} \ No newline at end of file +} diff --git a/ivy-domain/src/main/java/com/ivy/domain/di/IvyCoreBindingsModule.kt b/ivy-domain/src/main/java/com/ivy/domain/di/IvyCoreBindingsModule.kt index 4fa198dfdf..1b4c4b14ce 100644 --- a/ivy-domain/src/main/java/com/ivy/domain/di/IvyCoreBindingsModule.kt +++ b/ivy-domain/src/main/java/com/ivy/domain/di/IvyCoreBindingsModule.kt @@ -12,4 +12,4 @@ import dagger.hilt.components.SingletonComponent abstract class IvyCoreBindingsModule { @Binds abstract fun bindFeatures(features: IvyFeatures): Features -} \ No newline at end of file +} diff --git a/ivy-domain/src/main/java/com/ivy/domain/event/AccountUpdatedEvent.kt b/ivy-domain/src/main/java/com/ivy/domain/event/AccountUpdatedEvent.kt index c7ec0f3936..2d374b8340 100644 --- a/ivy-domain/src/main/java/com/ivy/domain/event/AccountUpdatedEvent.kt +++ b/ivy-domain/src/main/java/com/ivy/domain/event/AccountUpdatedEvent.kt @@ -1,3 +1,3 @@ package com.ivy.domain.event -data object AccountUpdatedEvent : EventBus.Event \ No newline at end of file +data object AccountUpdatedEvent : EventBus.Event diff --git a/ivy-domain/src/main/java/com/ivy/domain/event/EventBus.kt b/ivy-domain/src/main/java/com/ivy/domain/event/EventBus.kt index 730d301e5c..8be1707c0e 100644 --- a/ivy-domain/src/main/java/com/ivy/domain/event/EventBus.kt +++ b/ivy-domain/src/main/java/com/ivy/domain/event/EventBus.kt @@ -32,4 +32,4 @@ class EventBus @Inject constructor() { fun post(event: Event) { eventFlow.tryEmit(event) } -} \ No newline at end of file +} diff --git a/ivy-domain/src/main/java/com/ivy/domain/features/BoolFeature.kt b/ivy-domain/src/main/java/com/ivy/domain/features/BoolFeature.kt index ed5c0e6a5d..b7f7736879 100644 --- a/ivy-domain/src/main/java/com/ivy/domain/features/BoolFeature.kt +++ b/ivy-domain/src/main/java/com/ivy/domain/features/BoolFeature.kt @@ -41,4 +41,4 @@ class BoolFeature( private val featureKey: Preferences.Key get() = DatastoreKeys.ivyFeature(key) -} \ No newline at end of file +} diff --git a/ivy-domain/src/main/java/com/ivy/domain/features/Features.kt b/ivy-domain/src/main/java/com/ivy/domain/features/Features.kt index c80e8dba2b..c8f0b43606 100644 --- a/ivy-domain/src/main/java/com/ivy/domain/features/Features.kt +++ b/ivy-domain/src/main/java/com/ivy/domain/features/Features.kt @@ -5,4 +5,4 @@ interface Features { val compactTransactions: BoolFeature val allFeatures: List -} \ No newline at end of file +} diff --git a/ivy-domain/src/main/java/com/ivy/domain/features/IvyFeatures.kt b/ivy-domain/src/main/java/com/ivy/domain/features/IvyFeatures.kt index 306daa6104..e34dee1735 100644 --- a/ivy-domain/src/main/java/com/ivy/domain/features/IvyFeatures.kt +++ b/ivy-domain/src/main/java/com/ivy/domain/features/IvyFeatures.kt @@ -14,7 +14,7 @@ class IvyFeatures @Inject constructor() : Features { key = "compact_transaction", name = "Compact transactions", description = "Smaller transactions cards" + - " so you can fit more on your screen." + " so you can fit more on your screen." ) override val allFeatures: List @@ -22,4 +22,4 @@ class IvyFeatures @Inject constructor() : Features { homeV2, compactTransactions, ) -} \ No newline at end of file +} diff --git a/ivy-navigation/build.gradle.kts b/ivy-navigation/build.gradle.kts index 9ec48838c3..8f580f5723 100644 --- a/ivy-navigation/build.gradle.kts +++ b/ivy-navigation/build.gradle.kts @@ -10,4 +10,4 @@ dependencies { implementation(projects.ivyBase) implementation(projects.ivyDomain) implementation(projects.ivyDesign) -} \ No newline at end of file +} diff --git a/ivy-navigation/src/main/java/com/ivy/navigation/IvyPreview.kt b/ivy-navigation/src/main/java/com/ivy/navigation/IvyPreview.kt index 73e7095022..d37648eb41 100644 --- a/ivy-navigation/src/main/java/com/ivy/navigation/IvyPreview.kt +++ b/ivy-navigation/src/main/java/com/ivy/navigation/IvyPreview.kt @@ -11,4 +11,4 @@ fun IvyPreview( NavigationRoot(navigation = Navigation()) { IvyMaterial3Theme(dark = dark, content = content) } -} \ No newline at end of file +} diff --git a/ivy-navigation/src/main/java/com/ivy/navigation/Navigation.kt b/ivy-navigation/src/main/java/com/ivy/navigation/Navigation.kt index aa04a97bcb..9340d1388b 100644 --- a/ivy-navigation/src/main/java/com/ivy/navigation/Navigation.kt +++ b/ivy-navigation/src/main/java/com/ivy/navigation/Navigation.kt @@ -81,4 +81,4 @@ class Navigation @Inject constructor() { } lastScreen = null } -} \ No newline at end of file +} diff --git a/ivy-navigation/src/main/java/com/ivy/navigation/NavigationRoot.kt b/ivy-navigation/src/main/java/com/ivy/navigation/NavigationRoot.kt index f83a324192..74bc3c2816 100644 --- a/ivy-navigation/src/main/java/com/ivy/navigation/NavigationRoot.kt +++ b/ivy-navigation/src/main/java/com/ivy/navigation/NavigationRoot.kt @@ -54,4 +54,4 @@ inline fun screenScopedViewModel( ViewModelProvider(viewModelStoreOwner, it) } ?: ViewModelProvider(viewModelStoreOwner) return viewModelProvider[T::class.java] -} \ No newline at end of file +} diff --git a/ivy-navigation/src/main/java/com/ivy/navigation/Screen.kt b/ivy-navigation/src/main/java/com/ivy/navigation/Screen.kt index ec1c716a5f..d113f8623d 100644 --- a/ivy-navigation/src/main/java/com/ivy/navigation/Screen.kt +++ b/ivy-navigation/src/main/java/com/ivy/navigation/Screen.kt @@ -12,4 +12,4 @@ sealed interface Screen { */ val isLegacy: Boolean get() = false -} \ No newline at end of file +} diff --git a/ivy-navigation/src/main/java/com/ivy/navigation/Screens.kt b/ivy-navigation/src/main/java/com/ivy/navigation/Screens.kt index 1d1d8d04f8..cee578f041 100644 --- a/ivy-navigation/src/main/java/com/ivy/navigation/Screens.kt +++ b/ivy-navigation/src/main/java/com/ivy/navigation/Screens.kt @@ -68,7 +68,7 @@ data class EditPlannedScreen( fun mandatoryFilled(): Boolean { return amount != null && amount > 0.0 && - accountId != null + accountId != null } } @@ -137,4 +137,4 @@ data object AttributionsScreen : Screen data object ContributorsScreen : Screen -data object ReleasesScreen : Screen \ No newline at end of file +data object ReleasesScreen : Screen diff --git a/ivy-resources/build.gradle.kts b/ivy-resources/build.gradle.kts index f7b81594af..e678d923df 100644 --- a/ivy-resources/build.gradle.kts +++ b/ivy-resources/build.gradle.kts @@ -4,4 +4,4 @@ plugins { android { namespace = "com.ivy.resources" -} \ No newline at end of file +} diff --git a/ivy-resources/src/main/res/values-ar/strings.xml b/ivy-resources/src/main/res/values-ar/strings.xml index 587d735834..b3ded1ce1c 100644 --- a/ivy-resources/src/main/res/values-ar/strings.xml +++ b/ivy-resources/src/main/res/values-ar/strings.xml @@ -437,4 +437,5 @@ تجريبي الإعدادات التجريبية رصيد المحفظة + %1$s %2$s: المجموع (حصريا) diff --git a/ivy-resources/src/main/res/values-bg/strings.xml b/ivy-resources/src/main/res/values-bg/strings.xml index 827ce9623e..330d12ed74 100644 --- a/ivy-resources/src/main/res/values-bg/strings.xml +++ b/ivy-resources/src/main/res/values-bg/strings.xml @@ -437,4 +437,5 @@ Experimental Experimental Settings Wallet balance + Общо (без): %1$s %2$s \ No newline at end of file diff --git a/ivy-resources/src/main/res/values-es/strings.xml b/ivy-resources/src/main/res/values-es/strings.xml index 00d637985c..0896a70878 100644 --- a/ivy-resources/src/main/res/values-es/strings.xml +++ b/ivy-resources/src/main/res/values-es/strings.xml @@ -437,4 +437,5 @@ Experimental Ajustes experimentales Wallet balance + Total (exclusivo): %1$s %2$s diff --git a/ivy-resources/src/main/res/values-hi/strings.xml b/ivy-resources/src/main/res/values-hi/strings.xml index 896e73d9c8..cb1cdf627f 100644 --- a/ivy-resources/src/main/res/values-hi/strings.xml +++ b/ivy-resources/src/main/res/values-hi/strings.xml @@ -437,4 +437,5 @@ Experimental प्रायोगिक सेटिंग्स वॉलेट बैलेंस + कुल (अनन्य): %1$s %2$s \ No newline at end of file diff --git a/ivy-resources/src/main/res/values-it/strings.xml b/ivy-resources/src/main/res/values-it/strings.xml index fbc9bbbe4c..0381f6a532 100644 --- a/ivy-resources/src/main/res/values-it/strings.xml +++ b/ivy-resources/src/main/res/values-it/strings.xml @@ -437,4 +437,5 @@ Sperimantale Impostazioni Sperimentali Wallet balance + Totale (esclusivo): %1$s %2$s diff --git a/ivy-resources/src/main/res/values-kn/strings.xml b/ivy-resources/src/main/res/values-kn/strings.xml index 561cd1c641..be9c16cc03 100644 --- a/ivy-resources/src/main/res/values-kn/strings.xml +++ b/ivy-resources/src/main/res/values-kn/strings.xml @@ -437,4 +437,5 @@ ಪ್ರಯೋಗಾತ್ಮಕ ಪ್ರಯೋಗಾತ್ಮಕ ಸೆಟ್ಟಿಂಗ್‌ಗಳು Wallet balance + ಒಟ್ಟು (ವಿಶೇಷ): %1$s %2$s diff --git a/ivy-resources/src/main/res/values-mn/strings.xml b/ivy-resources/src/main/res/values-mn/strings.xml index 55c26847f7..0499f51bd2 100644 --- a/ivy-resources/src/main/res/values-mn/strings.xml +++ b/ivy-resources/src/main/res/values-mn/strings.xml @@ -437,4 +437,5 @@ Туршилт Туршилтын тохиргоо Хэтэвчний үлдэгдэл + Нийт (онцгой): %1$s %2$s diff --git a/ivy-resources/src/main/res/values-ru/strings.xml b/ivy-resources/src/main/res/values-ru/strings.xml index 4f98bc63f3..8795d187c2 100644 --- a/ivy-resources/src/main/res/values-ru/strings.xml +++ b/ivy-resources/src/main/res/values-ru/strings.xml @@ -437,4 +437,5 @@ Experimental Experimental Settings Wallet balance + Итого (эксклюзивно): %1$s %2$s diff --git a/ivy-resources/src/main/res/values/strings.xml b/ivy-resources/src/main/res/values/strings.xml index e0abc0aecc..e6469a772b 100644 --- a/ivy-resources/src/main/res/values/strings.xml +++ b/ivy-resources/src/main/res/values/strings.xml @@ -243,6 +243,8 @@ Show notifications Hide balance Click on the hidden balance to show the balance for 5s + Hide income + Click on the hidden income to show the balance for 5s Other Rate us on Google Play Share Ivy Wallet @@ -438,4 +440,5 @@ Experimental Experimental Settings Wallet balance + Total (exclusive): %1$s %2$s diff --git a/ivy-testing/build.gradle.kts b/ivy-testing/build.gradle.kts index 2b8849ae60..40a48cff4a 100644 --- a/ivy-testing/build.gradle.kts +++ b/ivy-testing/build.gradle.kts @@ -11,4 +11,4 @@ dependencies { // for this module we need test deps as "implementation" and not only "testImplementation" implementation(libs.bundles.testing) -} \ No newline at end of file +} diff --git a/ivy-testing/src/main/java/com/ivy/testing/ComposeViewModelTestExt.kt b/ivy-testing/src/main/java/com/ivy/testing/ComposeViewModelTestExt.kt index 02614d4374..8988b41084 100644 --- a/ivy-testing/src/main/java/com/ivy/testing/ComposeViewModelTestExt.kt +++ b/ivy-testing/src/main/java/com/ivy/testing/ComposeViewModelTestExt.kt @@ -25,4 +25,4 @@ fun ComposeViewModel.runTest( cancel() } } -} \ No newline at end of file +} diff --git a/ivy-testing/src/test/java/com/ivy/testing/ComposeViewModelTestExtTest.kt b/ivy-testing/src/test/java/com/ivy/testing/ComposeViewModelTestExtTest.kt index 2c7dbe0522..76ead46f4f 100644 --- a/ivy-testing/src/test/java/com/ivy/testing/ComposeViewModelTestExtTest.kt +++ b/ivy-testing/src/test/java/com/ivy/testing/ComposeViewModelTestExtTest.kt @@ -45,4 +45,4 @@ class ComposeViewModelTestExtTest : FreeSpec({ counter shouldBe 43 } } -}) \ No newline at end of file +}) diff --git a/ivy-testing/src/test/java/com/ivy/testing/FakeViewModel.kt b/ivy-testing/src/test/java/com/ivy/testing/FakeViewModel.kt index d355acf15b..b829f533de 100644 --- a/ivy-testing/src/test/java/com/ivy/testing/FakeViewModel.kt +++ b/ivy-testing/src/test/java/com/ivy/testing/FakeViewModel.kt @@ -36,4 +36,4 @@ class FakeViewModel : ComposeViewModel() { FakeUiEvent.Increment -> counter++ } } -} \ No newline at end of file +} diff --git a/ivy-widget-base/build.gradle.kts b/ivy-widget-base/build.gradle.kts index 1edf50761c..53872229c9 100644 --- a/ivy-widget-base/build.gradle.kts +++ b/ivy-widget-base/build.gradle.kts @@ -10,4 +10,4 @@ dependencies { implementation(projects.ivyBase) implementation(projects.ivyDomain) implementation(projects.ivyResources) -} \ No newline at end of file +} diff --git a/screen-accounts/build.gradle.kts b/screen-accounts/build.gradle.kts index 83baa261df..e9f42938e3 100644 --- a/screen-accounts/build.gradle.kts +++ b/screen-accounts/build.gradle.kts @@ -16,4 +16,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-accounts/src/main/java/com/ivy/accounts/AccountsEvent.kt b/screen-accounts/src/main/java/com/ivy/accounts/AccountsEvent.kt index da379c563d..36c1aeb5e3 100644 --- a/screen-accounts/src/main/java/com/ivy/accounts/AccountsEvent.kt +++ b/screen-accounts/src/main/java/com/ivy/accounts/AccountsEvent.kt @@ -8,4 +8,4 @@ sealed interface AccountsEvent { data class OnEditAccount(val editedAccount: Account, val newBalance: Double) : AccountsEvent data class OnReorderModalVisible(val reorderVisible: Boolean) : AccountsEvent -} \ No newline at end of file +} diff --git a/screen-accounts/src/main/java/com/ivy/accounts/AccountsState.kt b/screen-accounts/src/main/java/com/ivy/accounts/AccountsState.kt index 903b0fc65d..dda669c5f8 100644 --- a/screen-accounts/src/main/java/com/ivy/accounts/AccountsState.kt +++ b/screen-accounts/src/main/java/com/ivy/accounts/AccountsState.kt @@ -10,5 +10,7 @@ data class AccountsState( val accountsData: ImmutableList, val totalBalanceWithExcluded: String, val totalBalanceWithExcludedText: String, + val totalBalanceWithoutExcluded: String, + val totalBalanceWithoutExcludedText: String, val reorderVisible: Boolean -) \ No newline at end of file +) diff --git a/screen-accounts/src/main/java/com/ivy/accounts/AccountsTab.kt b/screen-accounts/src/main/java/com/ivy/accounts/AccountsTab.kt index f4670f67f4..b778804b96 100644 --- a/screen-accounts/src/main/java/com/ivy/accounts/AccountsTab.kt +++ b/screen-accounts/src/main/java/com/ivy/accounts/AccountsTab.kt @@ -114,6 +114,14 @@ private fun BoxWithConstraintsScope.UI( fontWeight = FontWeight.Bold ) ) + + Text( + text = state.totalBalanceWithoutExcludedText, + style = UI.typo.nC.style( + color = Gray, + fontWeight = FontWeight.Bold + ) + ) } Spacer(Modifier.weight(1f)) @@ -364,7 +372,9 @@ private fun PreviewAccountsTab() { ), totalBalanceWithExcluded = "25.54", totalBalanceWithExcludedText = "BGN 25.54", + totalBalanceWithoutExcluded = "25.54", + totalBalanceWithoutExcludedText = "BGN 25.54", reorderVisible = false ) } -} \ No newline at end of file +} diff --git a/screen-accounts/src/main/java/com/ivy/accounts/AccountsViewModel.kt b/screen-accounts/src/main/java/com/ivy/accounts/AccountsViewModel.kt index a8389a697e..02466cb40a 100644 --- a/screen-accounts/src/main/java/com/ivy/accounts/AccountsViewModel.kt +++ b/screen-accounts/src/main/java/com/ivy/accounts/AccountsViewModel.kt @@ -6,17 +6,17 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.viewModelScope +import com.ivy.data.db.dao.write.WriteAccountDao import com.ivy.domain.ComposeViewModel -import com.ivy.legacy.datamodel.Account import com.ivy.domain.event.AccountUpdatedEvent import com.ivy.domain.event.EventBus import com.ivy.legacy.data.SharedPrefs import com.ivy.legacy.data.model.AccountData import com.ivy.legacy.data.model.toCloseTimeRange +import com.ivy.legacy.datamodel.Account import com.ivy.legacy.domain.deprecated.logic.AccountCreator import com.ivy.legacy.utils.format import com.ivy.legacy.utils.ioThread -import com.ivy.data.db.dao.write.WriteAccountDao import com.ivy.resources.R import com.ivy.wallet.domain.action.account.AccountsAct import com.ivy.wallet.domain.action.settings.BaseCurrencyAct @@ -49,6 +49,8 @@ class AccountsViewModel @Inject constructor( private val accountsData = mutableStateOf(listOf()) private val totalBalanceWithExcluded = mutableStateOf("") private val totalBalanceWithExcludedText = mutableStateOf("") + private val totalBalanceWithoutExcluded = mutableStateOf("") + private val totalBalanceWithoutExcludedText = mutableStateOf("") private val reorderVisible = mutableStateOf(false) init { @@ -70,6 +72,8 @@ class AccountsViewModel @Inject constructor( accountsData = getAccountsData(), totalBalanceWithExcluded = getTotalBalanceWithExcluded(), totalBalanceWithExcludedText = getTotalBalanceWithExcludedText(), + totalBalanceWithoutExcluded = getTotalBalanceWithoutExcluded(), + totalBalanceWithoutExcludedText = getTotalBalanceWithoutExcludedText(), reorderVisible = getReorderVisible() ) } @@ -94,6 +98,16 @@ class AccountsViewModel @Inject constructor( return totalBalanceWithExcludedText.value } + @Composable + private fun getTotalBalanceWithoutExcluded(): String { + return totalBalanceWithoutExcluded.value + } + + @Composable + private fun getTotalBalanceWithoutExcludedText(): String { + return totalBalanceWithoutExcludedText.value + } + @Composable private fun getReorderVisible(): Boolean { return reorderVisible.value @@ -157,20 +171,34 @@ class AccountsViewModel @Inject constructor( ) ) - val totalBalanceIncludingExcluded = calcWalletBalanceAct( + val totalBalanceWithExcludedAccounts = calcWalletBalanceAct( CalcWalletBalanceAct.Input( baseCurrency = baseCurrencyCode, withExcluded = true ) ).toDouble() + val totalBalanceWithoutExcludedAccounts = calcWalletBalanceAct( + CalcWalletBalanceAct.Input( + baseCurrency = baseCurrencyCode + ) + ).toDouble() + baseCurrency.value = baseCurrencyCode accountsData.value = accountsDataList - totalBalanceWithExcluded.value = totalBalanceIncludingExcluded.toString() + totalBalanceWithExcludedText.value = totalBalanceWithExcludedAccounts.toString() totalBalanceWithExcludedText.value = context.getString( R.string.total, baseCurrencyCode, - totalBalanceIncludingExcluded.format( + totalBalanceWithExcludedAccounts.format( + baseCurrencyCode + ) + ) + totalBalanceWithoutExcluded.value = totalBalanceWithoutExcludedAccounts.toString() + totalBalanceWithoutExcludedText.value = context.getString( + R.string.total_exclusive, + baseCurrencyCode, + totalBalanceWithoutExcludedAccounts.format( baseCurrencyCode ) ) @@ -179,4 +207,4 @@ class AccountsViewModel @Inject constructor( private fun reorderModalVisible(visible: Boolean) { reorderVisible.value = visible } -} \ No newline at end of file +} diff --git a/screen-accounts/src/main/java/com/ivy/accounts/IncomeExpensesRow.kt b/screen-accounts/src/main/java/com/ivy/accounts/IncomeExpensesRow.kt index c8cfe37922..0e19c0b01e 100644 --- a/screen-accounts/src/main/java/com/ivy/accounts/IncomeExpensesRow.kt +++ b/screen-accounts/src/main/java/com/ivy/accounts/IncomeExpensesRow.kt @@ -119,4 +119,4 @@ private fun LabelAmountColumn( ) } } -} \ No newline at end of file +} diff --git a/screen-attributions/build.gradle.kts b/screen-attributions/build.gradle.kts index 6f48b62b19..82422949ff 100644 --- a/screen-attributions/build.gradle.kts +++ b/screen-attributions/build.gradle.kts @@ -15,4 +15,4 @@ dependencies { implementation(projects.ivyDesign) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-attributions/src/main/java/com/ivy/attributions/AttributionItem.kt b/screen-attributions/src/main/java/com/ivy/attributions/AttributionItem.kt index 44b0c96ada..6e7d102e79 100644 --- a/screen-attributions/src/main/java/com/ivy/attributions/AttributionItem.kt +++ b/screen-attributions/src/main/java/com/ivy/attributions/AttributionItem.kt @@ -3,4 +3,4 @@ package com.ivy.attributions sealed interface AttributionItem { data class Attribution(val name: String, val link: String) : AttributionItem data class Divider(val sectionName: String) : AttributionItem -} \ No newline at end of file +} diff --git a/screen-attributions/src/main/java/com/ivy/attributions/AttributionsEvent.kt b/screen-attributions/src/main/java/com/ivy/attributions/AttributionsEvent.kt index de87eb71ed..a827c7bc12 100644 --- a/screen-attributions/src/main/java/com/ivy/attributions/AttributionsEvent.kt +++ b/screen-attributions/src/main/java/com/ivy/attributions/AttributionsEvent.kt @@ -1,3 +1,3 @@ package com.ivy.attributions -sealed interface AttributionsEvent \ No newline at end of file +sealed interface AttributionsEvent diff --git a/screen-attributions/src/main/java/com/ivy/attributions/AttributionsProvider.kt b/screen-attributions/src/main/java/com/ivy/attributions/AttributionsProvider.kt index 5329393919..184433e6c1 100644 --- a/screen-attributions/src/main/java/com/ivy/attributions/AttributionsProvider.kt +++ b/screen-attributions/src/main/java/com/ivy/attributions/AttributionsProvider.kt @@ -109,4 +109,4 @@ class AttributionsProvider @Inject constructor() { fun provideAttributions(): ImmutableList { return attributionItems } -} \ No newline at end of file +} diff --git a/screen-attributions/src/main/java/com/ivy/attributions/AttributionsScreen.kt b/screen-attributions/src/main/java/com/ivy/attributions/AttributionsScreen.kt index 016a3b3423..4a8b4e7fd6 100644 --- a/screen-attributions/src/main/java/com/ivy/attributions/AttributionsScreen.kt +++ b/screen-attributions/src/main/java/com/ivy/attributions/AttributionsScreen.kt @@ -186,4 +186,4 @@ private fun AttributionsUIPreview() { IvyPreview { AttributionsUI(uiState = AttributionsState(attributionItems)) } -} \ No newline at end of file +} diff --git a/screen-attributions/src/main/java/com/ivy/attributions/AttributionsViewModel.kt b/screen-attributions/src/main/java/com/ivy/attributions/AttributionsViewModel.kt index 5c3ccf642c..4cacf2120d 100644 --- a/screen-attributions/src/main/java/com/ivy/attributions/AttributionsViewModel.kt +++ b/screen-attributions/src/main/java/com/ivy/attributions/AttributionsViewModel.kt @@ -16,4 +16,4 @@ class AttributionsViewModel @Inject constructor( } override fun onEvent(event: AttributionsEvent) {} -} \ No newline at end of file +} diff --git a/screen-balance/build.gradle.kts b/screen-balance/build.gradle.kts index c8266d50e9..bc2c6a3ce7 100644 --- a/screen-balance/build.gradle.kts +++ b/screen-balance/build.gradle.kts @@ -15,4 +15,4 @@ dependencies { implementation(projects.tempLegacyCode) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-balance/src/main/java/com/ivy/balance/BalanceEvent.kt b/screen-balance/src/main/java/com/ivy/balance/BalanceEvent.kt index 161f790d06..d0438ab2cd 100644 --- a/screen-balance/src/main/java/com/ivy/balance/BalanceEvent.kt +++ b/screen-balance/src/main/java/com/ivy/balance/BalanceEvent.kt @@ -6,4 +6,4 @@ sealed interface BalanceEvent { data class OnSetPeriod(val timePeriod: TimePeriod) : BalanceEvent data object OnPreviousMonth : BalanceEvent data object OnNextMonth : BalanceEvent -} \ No newline at end of file +} diff --git a/screen-budgets/build.gradle.kts b/screen-budgets/build.gradle.kts index fa62abd70f..ce76fe33e7 100644 --- a/screen-budgets/build.gradle.kts +++ b/screen-budgets/build.gradle.kts @@ -16,4 +16,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-budgets/src/main/java/com/ivy/budgets/BudgetBottomBar.kt b/screen-budgets/src/main/java/com/ivy/budgets/BudgetBottomBar.kt index eb773d1ced..a3468b8c71 100644 --- a/screen-budgets/src/main/java/com/ivy/budgets/BudgetBottomBar.kt +++ b/screen-budgets/src/main/java/com/ivy/budgets/BudgetBottomBar.kt @@ -8,8 +8,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import com.ivy.resources.R import com.ivy.legacy.IvyWalletPreview +import com.ivy.resources.R import com.ivy.wallet.ui.theme.Blue import com.ivy.wallet.ui.theme.components.BackBottomBar import com.ivy.wallet.ui.theme.components.IvyButton diff --git a/screen-budgets/src/main/java/com/ivy/budgets/BudgetExt.kt b/screen-budgets/src/main/java/com/ivy/budgets/BudgetExt.kt index 69837005ed..83e0bf5175 100644 --- a/screen-budgets/src/main/java/com/ivy/budgets/BudgetExt.kt +++ b/screen-budgets/src/main/java/com/ivy/budgets/BudgetExt.kt @@ -9,4 +9,4 @@ fun determineBudgetType(categoriesCount: Int): String { 1 -> stringRes(R.string.category_budget) else -> stringRes(R.string.multi_category_budget, categoriesCount.toString()) } -} \ No newline at end of file +} diff --git a/screen-budgets/src/main/java/com/ivy/budgets/BudgetModal.kt b/screen-budgets/src/main/java/com/ivy/budgets/BudgetModal.kt index 8074f3e0ad..5a9f5e84d4 100644 --- a/screen-budgets/src/main/java/com/ivy/budgets/BudgetModal.kt +++ b/screen-budgets/src/main/java/com/ivy/budgets/BudgetModal.kt @@ -23,13 +23,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.Budget -import com.ivy.legacy.datamodel.Category -import com.ivy.domain.legacy.ui.theme.components.ListItem import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.domain.legacy.ui.theme.components.ListItem import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.Budget +import com.ivy.legacy.datamodel.Category import com.ivy.legacy.legacy.ui.theme.modal.ModalNameInput import com.ivy.legacy.utils.isNotNullOrBlank import com.ivy.legacy.utils.selectEndTextFieldValue @@ -126,9 +126,13 @@ fun BoxWithConstraintsScope.BudgetModal( verticalAlignment = Alignment.CenterVertically ) { ModalTitle( - text = if (modal?.budget != null) stringResource( - R.string.edit_budget - ) else stringResource(R.string.create_budget) + text = if (modal?.budget != null) { + stringResource( + R.string.edit_budget + ) + } else { + stringResource(R.string.create_budget) + } ) if (initialBudget != null) { diff --git a/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreen.kt b/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreen.kt index 9f18834092..b1e903c024 100644 --- a/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreen.kt +++ b/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreen.kt @@ -23,14 +23,14 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.budgets.model.DisplayBudget -import com.ivy.legacy.datamodel.Budget import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.navigation.navigation +import com.ivy.legacy.datamodel.Budget import com.ivy.legacy.legacy.ui.theme.components.BudgetBattery import com.ivy.legacy.utils.clickableNoIndication import com.ivy.legacy.utils.format import com.ivy.navigation.BudgetScreen +import com.ivy.navigation.navigation import com.ivy.navigation.screenScopedViewModel import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gray diff --git a/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreenEvent.kt b/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreenEvent.kt index f18a3c482d..4cc1457f7e 100644 --- a/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreenEvent.kt +++ b/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreenEvent.kt @@ -11,4 +11,4 @@ sealed interface BudgetScreenEvent { data class OnDeleteBudget(val budget: Budget) : BudgetScreenEvent data class OnReorderModalVisible(val visible: Boolean) : BudgetScreenEvent data class OnBudgetModalData(val budgetModalData: BudgetModalData?) : BudgetScreenEvent -} \ No newline at end of file +} diff --git a/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreenState.kt b/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreenState.kt index 6bc154a66f..c91451235f 100644 --- a/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreenState.kt +++ b/screen-budgets/src/main/java/com/ivy/budgets/BudgetScreenState.kt @@ -18,4 +18,4 @@ data class BudgetScreenState( val timeRange: FromToTimeRange?, val reorderModalVisible: Boolean, val budgetModalData: BudgetModalData? -) \ No newline at end of file +) diff --git a/screen-budgets/src/main/java/com/ivy/budgets/BudgetViewModel.kt b/screen-budgets/src/main/java/com/ivy/budgets/BudgetViewModel.kt index 3ccdefcf5e..69b10d5018 100644 --- a/screen-budgets/src/main/java/com/ivy/budgets/BudgetViewModel.kt +++ b/screen-budgets/src/main/java/com/ivy/budgets/BudgetViewModel.kt @@ -6,7 +6,9 @@ import androidx.compose.runtime.mutableDoubleStateOf import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.viewModelScope import com.ivy.base.legacy.Transaction +import com.ivy.base.model.TransactionType import com.ivy.budgets.model.DisplayBudget +import com.ivy.data.db.dao.write.WriteBudgetDao import com.ivy.domain.ComposeViewModel import com.ivy.frp.sumOfSuspend import com.ivy.legacy.data.SharedPrefs @@ -17,8 +19,6 @@ import com.ivy.legacy.datamodel.Budget import com.ivy.legacy.datamodel.Category import com.ivy.legacy.domain.deprecated.logic.BudgetCreator import com.ivy.legacy.utils.isNotNullOrBlank -import com.ivy.data.db.dao.write.WriteBudgetDao -import com.ivy.base.model.TransactionType import com.ivy.wallet.domain.action.account.AccountsAct import com.ivy.wallet.domain.action.budget.BudgetsAct import com.ivy.wallet.domain.action.category.CategoriesAct diff --git a/screen-budgets/src/main/java/com/ivy/budgets/model/DisplayBudget.kt b/screen-budgets/src/main/java/com/ivy/budgets/model/DisplayBudget.kt index 812bb7f82e..ea9cfef717 100644 --- a/screen-budgets/src/main/java/com/ivy/budgets/model/DisplayBudget.kt +++ b/screen-budgets/src/main/java/com/ivy/budgets/model/DisplayBudget.kt @@ -1,8 +1,8 @@ package com.ivy.budgets.model import androidx.compose.runtime.Immutable -import com.ivy.wallet.domain.data.Reorderable import com.ivy.legacy.datamodel.Budget +import com.ivy.wallet.domain.data.Reorderable @Immutable data class DisplayBudget( diff --git a/screen-categories/build.gradle.kts b/screen-categories/build.gradle.kts index 647d72b87e..ca394ba8a9 100644 --- a/screen-categories/build.gradle.kts +++ b/screen-categories/build.gradle.kts @@ -16,4 +16,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-categories/src/main/java/com/ivy/categories/CategoriesBottomBar.kt b/screen-categories/src/main/java/com/ivy/categories/CategoriesBottomBar.kt index 0469d812e2..fe0c0ec97f 100644 --- a/screen-categories/src/main/java/com/ivy/categories/CategoriesBottomBar.kt +++ b/screen-categories/src/main/java/com/ivy/categories/CategoriesBottomBar.kt @@ -8,8 +8,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import com.ivy.resources.R import com.ivy.legacy.IvyWalletPreview +import com.ivy.resources.R import com.ivy.wallet.ui.theme.Blue import com.ivy.wallet.ui.theme.components.BackBottomBar import com.ivy.wallet.ui.theme.components.IvyButton diff --git a/screen-categories/src/main/java/com/ivy/categories/CategoriesScreen.kt b/screen-categories/src/main/java/com/ivy/categories/CategoriesScreen.kt index bb4f6f47e6..32fb500161 100644 --- a/screen-categories/src/main/java/com/ivy/categories/CategoriesScreen.kt +++ b/screen-categories/src/main/java/com/ivy/categories/CategoriesScreen.kt @@ -589,7 +589,7 @@ private fun Preview() { monthlyIncome = 400.0 ), - ) + ) ) UI(state = state) } diff --git a/screen-categories/src/main/java/com/ivy/categories/CategoriesScreenEvent.kt b/screen-categories/src/main/java/com/ivy/categories/CategoriesScreenEvent.kt index 4a5eea5d7e..b6e538c139 100644 --- a/screen-categories/src/main/java/com/ivy/categories/CategoriesScreenEvent.kt +++ b/screen-categories/src/main/java/com/ivy/categories/CategoriesScreenEvent.kt @@ -5,16 +5,16 @@ import com.ivy.wallet.domain.deprecated.logic.model.CreateCategoryData import com.ivy.wallet.ui.theme.modal.edit.CategoryModalData sealed interface CategoriesScreenEvent { - data class OnReorder( - val newOrder: List, - val sortOrder: SortOrder = SortOrder.DEFAULT - ) : CategoriesScreenEvent + data class OnReorder( + val newOrder: List, + val sortOrder: SortOrder = SortOrder.DEFAULT + ) : CategoriesScreenEvent - data class OnCreateCategory(val createCategoryData: CreateCategoryData) : - CategoriesScreenEvent + data class OnCreateCategory(val createCategoryData: CreateCategoryData) : + CategoriesScreenEvent - data class OnReorderModalVisible(val visible: Boolean) : CategoriesScreenEvent - data class OnSortOrderModalVisible(val visible: Boolean) : CategoriesScreenEvent - data class OnCategoryModalVisible(val categoryModalData: CategoryModalData?) : - CategoriesScreenEvent -} \ No newline at end of file + data class OnReorderModalVisible(val visible: Boolean) : CategoriesScreenEvent + data class OnSortOrderModalVisible(val visible: Boolean) : CategoriesScreenEvent + data class OnCategoryModalVisible(val categoryModalData: CategoryModalData?) : + CategoriesScreenEvent +} diff --git a/screen-categories/src/main/java/com/ivy/categories/CategoriesScreenState.kt b/screen-categories/src/main/java/com/ivy/categories/CategoriesScreenState.kt index 401adf8fb1..3673ea97d9 100644 --- a/screen-categories/src/main/java/com/ivy/categories/CategoriesScreenState.kt +++ b/screen-categories/src/main/java/com/ivy/categories/CategoriesScreenState.kt @@ -7,11 +7,11 @@ import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList data class CategoriesScreenState( - val baseCurrency: String = "", - val categories: ImmutableList = persistentListOf(), - val reorderModalVisible: Boolean = false, - val categoryModalData: CategoryModalData? = null, - val sortModalVisible: Boolean = false, - val sortOrderItems: ImmutableList = SortOrder.values().toList().toImmutableList(), - val sortOrder: SortOrder = SortOrder.DEFAULT -) \ No newline at end of file + val baseCurrency: String = "", + val categories: ImmutableList = persistentListOf(), + val reorderModalVisible: Boolean = false, + val categoryModalData: CategoryModalData? = null, + val sortModalVisible: Boolean = false, + val sortOrderItems: ImmutableList = SortOrder.values().toList().toImmutableList(), + val sortOrder: SortOrder = SortOrder.DEFAULT +) diff --git a/screen-categories/src/main/java/com/ivy/categories/CategoriesViewModel.kt b/screen-categories/src/main/java/com/ivy/categories/CategoriesViewModel.kt index 60be48ba6f..4639b0d151 100644 --- a/screen-categories/src/main/java/com/ivy/categories/CategoriesViewModel.kt +++ b/screen-categories/src/main/java/com/ivy/categories/CategoriesViewModel.kt @@ -5,12 +5,12 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.viewModelScope import com.ivy.base.legacy.Transaction +import com.ivy.data.db.dao.write.WriteCategoryDao import com.ivy.domain.ComposeViewModel import com.ivy.frp.action.thenMap import com.ivy.frp.thenInvokeAfter import com.ivy.legacy.data.SharedPrefs import com.ivy.legacy.datamodel.Account -import com.ivy.data.db.dao.write.WriteCategoryDao import com.ivy.wallet.domain.action.account.AccountsAct import com.ivy.wallet.domain.action.category.CategoriesAct import com.ivy.wallet.domain.action.category.CategoryIncomeWithAccountFiltersAct @@ -122,7 +122,7 @@ class CategoriesViewModel @Inject constructor( TrnsWithRangeAndAccFiltersAct.Input( range = range, accountIdFilterSet = suspend { allAccounts } thenMap { it.id } - thenInvokeAfter { it.toHashSet() } + thenInvokeAfter { it.toHashSet() } ) ) diff --git a/screen-categories/src/main/java/com/ivy/categories/CategoryData.kt b/screen-categories/src/main/java/com/ivy/categories/CategoryData.kt index 0f0c36dd3a..3098906d73 100644 --- a/screen-categories/src/main/java/com/ivy/categories/CategoryData.kt +++ b/screen-categories/src/main/java/com/ivy/categories/CategoryData.kt @@ -1,7 +1,7 @@ package com.ivy.categories -import com.ivy.wallet.domain.data.Reorderable import com.ivy.legacy.datamodel.Category +import com.ivy.wallet.domain.data.Reorderable data class CategoryData( val category: Category, diff --git a/screen-contributors/build.gradle.kts b/screen-contributors/build.gradle.kts index ae8ce90e9b..e07a2baa11 100644 --- a/screen-contributors/build.gradle.kts +++ b/screen-contributors/build.gradle.kts @@ -17,4 +17,4 @@ dependencies { implementation(libs.bundles.ktor) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-contributors/src/main/java/com/ivy/contributors/ContributorsEvent.kt b/screen-contributors/src/main/java/com/ivy/contributors/ContributorsEvent.kt index 09494db328..961c14741a 100644 --- a/screen-contributors/src/main/java/com/ivy/contributors/ContributorsEvent.kt +++ b/screen-contributors/src/main/java/com/ivy/contributors/ContributorsEvent.kt @@ -2,4 +2,4 @@ package com.ivy.contributors sealed interface ContributorsEvent { data object TryAgainButtonClicked : ContributorsEvent -} \ No newline at end of file +} diff --git a/screen-contributors/src/main/java/com/ivy/contributors/ContributorsScreen.kt b/screen-contributors/src/main/java/com/ivy/contributors/ContributorsScreen.kt index 300b3f3424..135d3d803b 100644 --- a/screen-contributors/src/main/java/com/ivy/contributors/ContributorsScreen.kt +++ b/screen-contributors/src/main/java/com/ivy/contributors/ContributorsScreen.kt @@ -404,4 +404,4 @@ private fun PreviewLoading() { onEvent = {} ) } -} \ No newline at end of file +} diff --git a/screen-contributors/src/main/java/com/ivy/contributors/ContributorsState.kt b/screen-contributors/src/main/java/com/ivy/contributors/ContributorsState.kt index 36e41c4f5d..ddc8bb18a1 100644 --- a/screen-contributors/src/main/java/com/ivy/contributors/ContributorsState.kt +++ b/screen-contributors/src/main/java/com/ivy/contributors/ContributorsState.kt @@ -17,4 +17,4 @@ sealed interface ContributorsResponse { data object Loading : ContributorsResponse data class Success(val contributors: ImmutableList) : ContributorsResponse data class Error(val errorMessage: String) : ContributorsResponse -} \ No newline at end of file +} diff --git a/screen-contributors/src/main/java/com/ivy/contributors/ContributorsViewModel.kt b/screen-contributors/src/main/java/com/ivy/contributors/ContributorsViewModel.kt index fe88d3a095..a0d3720e37 100644 --- a/screen-contributors/src/main/java/com/ivy/contributors/ContributorsViewModel.kt +++ b/screen-contributors/src/main/java/com/ivy/contributors/ContributorsViewModel.kt @@ -80,4 +80,4 @@ class ContributorsViewModel @Inject constructor( projectResponse.value = ProjectResponse.Error } } -} \ No newline at end of file +} diff --git a/screen-contributors/src/main/java/com/ivy/contributors/IvyWalletRepositoryDataSource.kt b/screen-contributors/src/main/java/com/ivy/contributors/IvyWalletRepositoryDataSource.kt index dab0432c09..7ebd446d81 100644 --- a/screen-contributors/src/main/java/com/ivy/contributors/IvyWalletRepositoryDataSource.kt +++ b/screen-contributors/src/main/java/com/ivy/contributors/IvyWalletRepositoryDataSource.kt @@ -65,4 +65,4 @@ class IvyWalletRepositoryDataSource @Inject constructor( null } } -} \ No newline at end of file +} diff --git a/screen-contributors/src/main/java/com/ivy/contributors/ProjectRepositoryInfo.kt b/screen-contributors/src/main/java/com/ivy/contributors/ProjectRepositoryInfo.kt index a5d229ec5d..8b64416a07 100644 --- a/screen-contributors/src/main/java/com/ivy/contributors/ProjectRepositoryInfo.kt +++ b/screen-contributors/src/main/java/com/ivy/contributors/ProjectRepositoryInfo.kt @@ -4,4 +4,4 @@ data class ProjectRepositoryInfo( val forks: String, val stars: String, val url: String -) \ No newline at end of file +) diff --git a/screen-contributors/src/test/java/com/ivy/contributors/ContributorsViewModelTest.kt b/screen-contributors/src/test/java/com/ivy/contributors/ContributorsViewModelTest.kt index a67af40400..10bdd49709 100644 --- a/screen-contributors/src/test/java/com/ivy/contributors/ContributorsViewModelTest.kt +++ b/screen-contributors/src/test/java/com/ivy/contributors/ContributorsViewModelTest.kt @@ -80,4 +80,4 @@ class ContributorsViewModelTest : FreeSpec({ projectResponse.shouldBeInstanceOf() } } -}) \ No newline at end of file +}) diff --git a/screen-exchange-rates/build.gradle.kts b/screen-exchange-rates/build.gradle.kts index 29e86047c0..e80f88f4a7 100644 --- a/screen-exchange-rates/build.gradle.kts +++ b/screen-exchange-rates/build.gradle.kts @@ -16,4 +16,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-exchange-rates/src/main/java/com/ivy/exchangerates/component/RateItem.kt b/screen-exchange-rates/src/main/java/com/ivy/exchangerates/component/RateItem.kt index 7f45a2baac..0dbae9567f 100644 --- a/screen-exchange-rates/src/main/java/com/ivy/exchangerates/component/RateItem.kt +++ b/screen-exchange-rates/src/main/java/com/ivy/exchangerates/component/RateItem.kt @@ -12,14 +12,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletComponentPreview import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.design.l1_buildingBlocks.SpacerHor import com.ivy.design.l1_buildingBlocks.SpacerWeight import com.ivy.exchangerates.data.RateUi -import com.ivy.wallet.ui.theme.components.DeleteButton +import com.ivy.legacy.IvyWalletComponentPreview import com.ivy.legacy.utils.format +import com.ivy.wallet.ui.theme.components.DeleteButton @Composable fun RateItem( diff --git a/screen-exchange-rates/src/main/java/com/ivy/exchangerates/modal/AddRateModal.kt b/screen-exchange-rates/src/main/java/com/ivy/exchangerates/modal/AddRateModal.kt index a9d56733df..e57d9fbce4 100644 --- a/screen-exchange-rates/src/main/java/com/ivy/exchangerates/modal/AddRateModal.kt +++ b/screen-exchange-rates/src/main/java/com/ivy/exchangerates/modal/AddRateModal.kt @@ -15,13 +15,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletPreview import com.ivy.design.l0_system.Orange import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.design.l1_buildingBlocks.SpacerVer -import com.ivy.exchangerates.data.RateUi import com.ivy.exchangerates.RatesEvent +import com.ivy.exchangerates.data.RateUi +import com.ivy.legacy.IvyWalletPreview import com.ivy.wallet.ui.theme.modal.IvyModal import com.ivy.wallet.ui.theme.modal.ModalAdd import com.ivy.wallet.ui.theme.modal.ModalTitle diff --git a/screen-features/build.gradle.kts b/screen-features/build.gradle.kts index 0e7cc5da4e..8368d7c5b3 100644 --- a/screen-features/build.gradle.kts +++ b/screen-features/build.gradle.kts @@ -15,4 +15,4 @@ dependencies { implementation(projects.ivyDesign) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-features/src/main/java/com/ivy/features/FeaturesScreen.kt b/screen-features/src/main/java/com/ivy/features/FeaturesScreen.kt index 11205a783b..7747750066 100644 --- a/screen-features/src/main/java/com/ivy/features/FeaturesScreen.kt +++ b/screen-features/src/main/java/com/ivy/features/FeaturesScreen.kt @@ -158,4 +158,4 @@ private fun FeatureRow( Switch(checked = feature.enabled, onCheckedChange = { onToggleClick() }) } } -} \ No newline at end of file +} diff --git a/screen-features/src/main/java/com/ivy/features/FeaturesUiEvent.kt b/screen-features/src/main/java/com/ivy/features/FeaturesUiEvent.kt index 8221762c0e..74d7006073 100644 --- a/screen-features/src/main/java/com/ivy/features/FeaturesUiEvent.kt +++ b/screen-features/src/main/java/com/ivy/features/FeaturesUiEvent.kt @@ -2,4 +2,4 @@ package com.ivy.features sealed interface FeaturesUiEvent { data class ToggleFeature(val index: Int) : FeaturesUiEvent -} \ No newline at end of file +} diff --git a/screen-features/src/main/java/com/ivy/features/FeaturesUiState.kt b/screen-features/src/main/java/com/ivy/features/FeaturesUiState.kt index 1443ef0f5e..ee51b979de 100644 --- a/screen-features/src/main/java/com/ivy/features/FeaturesUiState.kt +++ b/screen-features/src/main/java/com/ivy/features/FeaturesUiState.kt @@ -10,4 +10,4 @@ data class FeatureUi( val name: String, val enabled: Boolean, val description: String?, -) \ No newline at end of file +) diff --git a/screen-features/src/main/java/com/ivy/features/FeaturesViewModel.kt b/screen-features/src/main/java/com/ivy/features/FeaturesViewModel.kt index 0ad9fd4751..909fad9a70 100644 --- a/screen-features/src/main/java/com/ivy/features/FeaturesViewModel.kt +++ b/screen-features/src/main/java/com/ivy/features/FeaturesViewModel.kt @@ -53,4 +53,4 @@ class FeaturesViewModel @Inject constructor( feature.set(context, !enabled) } } -} \ No newline at end of file +} diff --git a/screen-home/build.gradle.kts b/screen-home/build.gradle.kts index 6fbd39402d..d778d96f24 100644 --- a/screen-home/build.gradle.kts +++ b/screen-home/build.gradle.kts @@ -19,4 +19,4 @@ dependencies { implementation(projects.widgetAddTransaction) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-home/src/main/java/com/ivy/home/Constants.kt b/screen-home/src/main/java/com/ivy/home/Constants.kt index 1c3a1c6502..e2f06c3289 100644 --- a/screen-home/src/main/java/com/ivy/home/Constants.kt +++ b/screen-home/src/main/java/com/ivy/home/Constants.kt @@ -3,4 +3,4 @@ package com.ivy.home object Constants { const val SWIPE_HORIZONTAL_THRESHOLD = 200 const val SWIPE_DOWN_THRESHOLD_OPEN_MORE_MENU = 200 -} \ No newline at end of file +} diff --git a/screen-home/src/main/java/com/ivy/home/HomeEvent.kt b/screen-home/src/main/java/com/ivy/home/HomeEvent.kt index 0cfcc5ce03..381a2880e5 100644 --- a/screen-home/src/main/java/com/ivy/home/HomeEvent.kt +++ b/screen-home/src/main/java/com/ivy/home/HomeEvent.kt @@ -1,8 +1,8 @@ package com.ivy.home import com.ivy.base.legacy.Transaction -import com.ivy.legacy.data.model.TimePeriod import com.ivy.home.customerjourney.CustomerJourneyCardModel +import com.ivy.legacy.data.model.TimePeriod sealed interface HomeEvent { data class SetUpcomingExpanded(val expanded: Boolean) : HomeEvent @@ -10,6 +10,7 @@ sealed interface HomeEvent { data object BalanceClick : HomeEvent data object HiddenBalanceClick : HomeEvent + data object HiddenIncomeClick : HomeEvent data class SetExpanded(val expanded: Boolean) : HomeEvent data object SwitchTheme : HomeEvent diff --git a/screen-home/src/main/java/com/ivy/home/HomeHeader.kt b/screen-home/src/main/java/com/ivy/home/HomeHeader.kt index 184790ff98..60ba768967 100644 --- a/screen-home/src/main/java/com/ivy/home/HomeHeader.kt +++ b/screen-home/src/main/java/com/ivy/home/HomeHeader.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp +import com.ivy.base.model.TransactionType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.legacy.data.model.TimePeriod @@ -46,7 +47,6 @@ import com.ivy.legacy.utils.thenIf import com.ivy.legacy.utils.verticalSwipeListener import com.ivy.navigation.PieChartStatisticScreen import com.ivy.navigation.navigation -import com.ivy.base.model.TransactionType import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gradient import com.ivy.wallet.ui.theme.GradientGreen @@ -101,7 +101,7 @@ internal fun HomeHeader( onBalanceClick = onBalanceClick, onHiddenBalanceClick = onHiddenBalanceClick, onSelectNextMonth = onSelectNextMonth, - onSelectPreviousMonth = onSelectPreviousMonth + onSelectPreviousMonth = onSelectPreviousMonth, ) Spacer(Modifier.height(16.dp)) @@ -167,7 +167,7 @@ private fun HeaderStickyRow( val overflow by remember(lengthOfCurrencyAndBalance, lengthOfMonthRange) { derivedStateOf { lengthOfCurrencyAndBalance >= OverflowLengthOfBalance && - lengthOfMonthRange >= OverflowLengthOfMontthRange + lengthOfMonthRange >= OverflowLengthOfMontthRange } } @@ -222,6 +222,8 @@ fun CashFlowInfo( monthlyIncome: Double, monthlyExpenses: Double, hideBalance: Boolean, + hideIncome: Boolean, + onHiddenIncomeClick: () -> Unit, onOpenMoreMenu: () -> Unit, onBalanceClick: () -> Unit, percentExpanded: Float, @@ -261,6 +263,8 @@ fun CashFlowInfo( currency = currency, monthlyIncome = monthlyIncome, monthlyExpenses = monthlyExpenses, + hideIncome = hideIncome, + onHiddenIncomeClick = onHiddenIncomeClick ) val cashflow = monthlyIncome - monthlyExpenses @@ -295,6 +299,8 @@ private fun IncomeExpenses( currency: String, monthlyIncome: Double, monthlyExpenses: Double, + hideIncome: Boolean, + onHiddenIncomeClick: () -> Unit, ) { Row( modifier = Modifier.fillMaxWidth(), @@ -313,12 +319,17 @@ private fun IncomeExpenses( currency = currency, amount = monthlyIncome, testTag = "home_card_income", + hideIncome = hideIncome ) { - nav.navigateTo( - PieChartStatisticScreen( - type = TransactionType.INCOME, - ), - ) + if (hideIncome) { + onHiddenIncomeClick() + } else { + nav.navigateTo( + PieChartStatisticScreen( + type = TransactionType.INCOME, + ), + ) + } } Spacer(Modifier.width(12.dp)) @@ -354,6 +365,7 @@ private fun RowScope.HeaderCard( currency: String, amount: Double, testTag: String, + hideIncome: Boolean = false, onClick: () -> Unit, ) { Column( @@ -406,6 +418,7 @@ private fun RowScope.HeaderCard( amount = amount, currency = currency, textColor = textColor, + hideIncome = hideIncome, shortenBigNumbers = true, ) @@ -414,4 +427,4 @@ private fun RowScope.HeaderCard( Spacer(Modifier.height(20.dp)) } -} \ No newline at end of file +} diff --git a/screen-home/src/main/java/com/ivy/home/HomeMoreMenu.kt b/screen-home/src/main/java/com/ivy/home/HomeMoreMenu.kt index fa2bba8cd1..77316b1daf 100644 --- a/screen-home/src/main/java/com/ivy/home/HomeMoreMenu.kt +++ b/screen-home/src/main/java/com/ivy/home/HomeMoreMenu.kt @@ -611,4 +611,4 @@ private fun BoxWithConstraintsScope.Preview() { onCurrencyClick = {} ) } -} \ No newline at end of file +} diff --git a/screen-home/src/main/java/com/ivy/home/HomeState.kt b/screen-home/src/main/java/com/ivy/home/HomeState.kt index 912f67c332..855ec02e6a 100644 --- a/screen-home/src/main/java/com/ivy/home/HomeState.kt +++ b/screen-home/src/main/java/com/ivy/home/HomeState.kt @@ -1,8 +1,8 @@ package com.ivy.home import androidx.compose.runtime.Immutable -import com.ivy.base.legacy.TransactionHistoryItem import com.ivy.base.legacy.Theme +import com.ivy.base.legacy.TransactionHistoryItem import com.ivy.home.customerjourney.CustomerJourneyCardModel import com.ivy.legacy.data.AppBaseData import com.ivy.legacy.data.BufferInfo @@ -32,5 +32,6 @@ data class HomeState( val customerJourneyCards: ImmutableList, val hideBalance: Boolean, + val hideIncome: Boolean, val expanded: Boolean -) \ No newline at end of file +) diff --git a/screen-home/src/main/java/com/ivy/home/HomeTab.kt b/screen-home/src/main/java/com/ivy/home/HomeTab.kt index 2e82bfd95a..12c2e2a23d 100644 --- a/screen-home/src/main/java/com/ivy/home/HomeTab.kt +++ b/screen-home/src/main/java/com/ivy/home/HomeTab.kt @@ -24,9 +24,9 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.ivy.base.legacy.Theme import com.ivy.base.legacy.Transaction import com.ivy.base.legacy.TransactionHistoryItem -import com.ivy.base.legacy.Theme import com.ivy.base.legacy.stringRes import com.ivy.common.ui.rememberScrollPositionListState import com.ivy.frp.forward @@ -149,6 +149,7 @@ private fun BoxWithConstraintsScope.UI( HomeLazyColumn( hideBalance = uiState.hideBalance, + hideIncome = uiState.hideIncome, onSetExpanded = { onEvent(HomeEvent.SetExpanded(it)) }, @@ -162,6 +163,9 @@ private fun BoxWithConstraintsScope.UI( onHiddenBalanceClick = { onEvent(HomeEvent.HiddenBalanceClick) }, + onHiddenIncomeClick = { + onEvent(HomeEvent.HiddenIncomeClick) + }, period = uiState.period, listState = listState, @@ -268,6 +272,7 @@ private fun BoxWithConstraintsScope.UI( @Composable fun HomeLazyColumn( hideBalance: Boolean, + hideIncome: Boolean, onSetExpanded: (Boolean) -> Unit, listState: LazyListState, period: TimePeriod, @@ -291,6 +296,7 @@ fun HomeLazyColumn( onPayOrGet: (Transaction) -> Unit, onDismiss: (CustomerJourneyCardModel) -> Unit, onHiddenBalanceClick: () -> Unit, + onHiddenIncomeClick: () -> Unit, onSkipTransaction: (Transaction) -> Unit, onSkipAllTransactions: (List) -> Unit, modifier: Modifier = Modifier @@ -330,7 +336,9 @@ fun HomeLazyColumn( onOpenMoreMenu = onOpenMoreMenu, onBalanceClick = onBalanceClick, onHiddenBalanceClick = onHiddenBalanceClick, - percentExpanded = 1f + percentExpanded = 1f, + hideIncome = hideIncome, + onHiddenIncomeClick = onHiddenIncomeClick ) } item { @@ -400,9 +408,10 @@ private fun BoxWithConstraintsScope.PreviewHomeTab() { ), period = ivyWalletCtx().selectedPeriod, hideBalance = false, + hideIncome = false, expanded = false ), onEvent = {} ) } -} \ No newline at end of file +} diff --git a/screen-home/src/main/java/com/ivy/home/HomeViewModel.kt b/screen-home/src/main/java/com/ivy/home/HomeViewModel.kt index e7bd421df5..36c109f3ed 100644 --- a/screen-home/src/main/java/com/ivy/home/HomeViewModel.kt +++ b/screen-home/src/main/java/com/ivy/home/HomeViewModel.kt @@ -4,9 +4,9 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.viewModelScope +import com.ivy.base.legacy.Theme import com.ivy.base.legacy.Transaction import com.ivy.base.legacy.TransactionHistoryItem -import com.ivy.base.legacy.Theme import com.ivy.domain.ComposeViewModel import com.ivy.frp.fixUnit import com.ivy.frp.then @@ -24,6 +24,7 @@ import com.ivy.legacy.datamodel.Account import com.ivy.legacy.datamodel.Settings import com.ivy.legacy.domain.action.exchange.SyncExchangeRatesAct import com.ivy.legacy.domain.action.settings.UpdateSettingsAct +import com.ivy.legacy.domain.action.viewmodel.home.ShouldHideIncomeAct import com.ivy.legacy.utils.dateNowUTC import com.ivy.legacy.utils.ioThread import com.ivy.navigation.BalanceScreen @@ -73,6 +74,7 @@ class HomeViewModel @Inject constructor( private val hasTrnsAct: HasTrnsAct, private val startDayOfMonthAct: StartDayOfMonthAct, private val shouldHideBalanceAct: ShouldHideBalanceAct, + private val shouldHideIncomeAct: ShouldHideIncomeAct, private val updateSettingsAct: UpdateSettingsAct, private val updateAccCacheAct: UpdateAccCacheAct, private val updateCategoriesCacheAct: UpdateCategoriesCacheAct, @@ -114,6 +116,7 @@ class HomeViewModel @Inject constructor( private val customerJourneyCards = mutableStateOf>(persistentListOf()) private val hideBalance = mutableStateOf(false) + private val hideIncome = mutableStateOf(false) private val expanded = mutableStateOf(true) @Composable @@ -135,7 +138,8 @@ class HomeViewModel @Inject constructor( overdue = getOverdue(), customerJourneyCards = getCustomerJourneyCards(), hideBalance = getHideBalance(), - expanded = getExpanded() + expanded = getExpanded(), + hideIncome = getHideIncome() ) } @@ -204,11 +208,17 @@ class HomeViewModel @Inject constructor( return expanded.value } + @Composable + private fun getHideIncome(): Boolean { + return hideIncome.value + } + override fun onEvent(event: HomeEvent) { viewModelScope.launch { when (event) { HomeEvent.BalanceClick -> onBalanceClick() HomeEvent.HiddenBalanceClick -> onHiddenBalanceClick() + HomeEvent.HiddenIncomeClick -> onHiddenIncomeClick() is HomeEvent.PayOrGetPlanned -> payOrGetPlanned(event.transaction) is HomeEvent.SkipPlanned -> skipPlanned(event.transaction) is HomeEvent.SkipAllPlanned -> skipAllPlanned(event.transactions) @@ -241,19 +251,21 @@ class HomeViewModel @Inject constructor( ) = suspend { val settings = settingsAct(Unit) val hideBalance = shouldHideBalanceAct(Unit) + val hideIncome = shouldHideIncomeAct(Unit) theme.value = settings.theme name.value = settings.name period.value = timePeriod this.hideBalance.value = hideBalance + this.hideIncome.value = hideIncome // This method is used to restore the theme when user imports locally backed up data ivyContext.switchTheme(theme = settings.theme) Pair(settings, period.value.toRange(ivyContext.startDayOfMonth).toCloseTimeRange()) } then ::loadAppBaseData then ::loadIncomeExpenseBalance then - ::loadBuffer then ::loadTrnHistory then - ::loadDueTrns thenInvokeAfter ::loadCustomerJourney + ::loadBuffer then ::loadTrnHistory then + ::loadDueTrns thenInvokeAfter ::loadCustomerJourney private suspend fun loadAppBaseData( input: Pair @@ -387,6 +399,15 @@ class HomeViewModel @Inject constructor( hideBalance.value = true } + private suspend fun onHiddenIncomeClick() { + hideIncome.value = false + + // Showing Balance fow 5s + delay(5000) + + hideIncome.value = true + } + private fun switchTheme() = settingsAct then { it.copy( theme = when (it.theme) { @@ -485,4 +506,4 @@ class HomeViewModel @Inject constructor( private fun setExpanded(expanded: Boolean) { this.expanded.value = expanded } -} \ No newline at end of file +} diff --git a/screen-home/src/main/java/com/ivy/home/customerjourney/CustomerJourneyCardModel.kt b/screen-home/src/main/java/com/ivy/home/customerjourney/CustomerJourneyCardModel.kt index aeba6f387e..bb2da826be 100644 --- a/screen-home/src/main/java/com/ivy/home/customerjourney/CustomerJourneyCardModel.kt +++ b/screen-home/src/main/java/com/ivy/home/customerjourney/CustomerJourneyCardModel.kt @@ -2,8 +2,8 @@ package com.ivy.home.customerjourney import androidx.annotation.DrawableRes import androidx.compose.runtime.Immutable -import com.ivy.domain.RootScreen import com.ivy.design.l0_system.Gradient +import com.ivy.domain.RootScreen import com.ivy.legacy.IvyWalletCtx import com.ivy.navigation.Navigation @@ -21,4 +21,4 @@ data class CustomerJourneyCardModel( val background: Gradient, val onAction: (Navigation, IvyWalletCtx, RootScreen) -> Unit -) \ No newline at end of file +) diff --git a/screen-home/src/main/java/com/ivy/home/customerjourney/CustomerJourneyCardsProvider.kt b/screen-home/src/main/java/com/ivy/home/customerjourney/CustomerJourneyCardsProvider.kt index 2b88332267..b26a457fb4 100644 --- a/screen-home/src/main/java/com/ivy/home/customerjourney/CustomerJourneyCardsProvider.kt +++ b/screen-home/src/main/java/com/ivy/home/customerjourney/CustomerJourneyCardsProvider.kt @@ -1,6 +1,9 @@ package com.ivy.home.customerjourney import com.ivy.base.legacy.stringRes +import com.ivy.base.model.TransactionType +import com.ivy.data.db.dao.read.PlannedPaymentRuleDao +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.design.l0_system.Blue import com.ivy.design.l0_system.Blue3 import com.ivy.design.l0_system.Gradient @@ -16,9 +19,6 @@ import com.ivy.legacy.data.SharedPrefs import com.ivy.legacy.data.model.MainTab import com.ivy.navigation.EditPlannedScreen import com.ivy.navigation.PieChartStatisticScreen -import com.ivy.data.db.dao.read.PlannedPaymentRuleDao -import com.ivy.data.db.dao.read.TransactionDao -import com.ivy.base.model.TransactionType import com.ivy.resources.R import com.ivy.widget.transaction.AddTransactionWidgetCompact import javax.inject.Inject @@ -127,7 +127,7 @@ class CustomerJourneyCardsProvider @Inject constructor( }, title = stringRes(R.string.did_you_know), description = "You can see a PieChart for your expenses!" + - " Click the Expense card on the top of the dashboard.", + " Click the Expense card on the top of the dashboard.", cta = stringRes(R.string.expenses_piechart), ctaIcon = R.drawable.ic_custom_bills_s, background = Gradient.solid(Red), @@ -223,7 +223,7 @@ class CustomerJourneyCardsProvider @Inject constructor( trnCount >= 28 }, description = "It looks like that you're enjoying Ivy Wallet! " + - "If you haven't yet, feel free join our invite-only Ivy Telegram Community and make our app better :)", + "If you haven't yet, feel free join our invite-only Ivy Telegram Community and make our app better :)", title = "Ivy Community", cta = "Join now", ctaIcon = R.drawable.ic_telegram_24dp, @@ -234,4 +234,4 @@ class CustomerJourneyCardsProvider @Inject constructor( } ) } -} \ No newline at end of file +} diff --git a/screen-import-data/build.gradle.kts b/screen-import-data/build.gradle.kts index 66591e2299..d12311466b 100644 --- a/screen-import-data/build.gradle.kts +++ b/screen-import-data/build.gradle.kts @@ -20,4 +20,4 @@ dependencies { implementation(libs.bundles.opencsv) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-import-data/src/main/java/com/ivy/importdata/csv/CSVScreen.kt b/screen-import-data/src/main/java/com/ivy/importdata/csv/CSVScreen.kt index 0882344d43..209723d247 100644 --- a/screen-import-data/src/main/java/com/ivy/importdata/csv/CSVScreen.kt +++ b/screen-import-data/src/main/java/com/ivy/importdata/csv/CSVScreen.kt @@ -35,14 +35,14 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import com.ivy.legacy.ivyWalletCtx import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.colorAs import com.ivy.importdata.csvimport.flow.ImportProcessing import com.ivy.importdata.csvimport.flow.ImportResultUI +import com.ivy.legacy.ivyWalletCtx +import com.ivy.legacy.utils.thenIf import com.ivy.navigation.CSVScreen import com.ivy.onboarding.viewmodel.OnboardingViewModel -import com.ivy.legacy.utils.thenIf import kotlin.math.abs @Composable diff --git a/screen-import-data/src/main/java/com/ivy/importdata/csv/CSVViewModel.kt b/screen-import-data/src/main/java/com/ivy/importdata/csv/CSVViewModel.kt index 98b6f223b1..e706a11ccc 100644 --- a/screen-import-data/src/main/java/com/ivy/importdata/csv/CSVViewModel.kt +++ b/screen-import-data/src/main/java/com/ivy/importdata/csv/CSVViewModel.kt @@ -225,9 +225,9 @@ class CSVViewModel @Inject constructor( @Composable private fun continueEnabled(important: ImportantFields?): Boolean { return important != null && important.accountStatus.success && - important.amountStatus.success && - important.typeStatus.success && - important.dateStatus.success + important.amountStatus.success && + important.typeStatus.success && + important.dateStatus.success } @Composable diff --git a/screen-import-data/src/main/java/com/ivy/importdata/csv/domain/CSVImporterV2.kt b/screen-import-data/src/main/java/com/ivy/importdata/csv/domain/CSVImporterV2.kt index 5d0050076b..e234dd0235 100644 --- a/screen-import-data/src/main/java/com/ivy/importdata/csv/domain/CSVImporterV2.kt +++ b/screen-import-data/src/main/java/com/ivy/importdata/csv/domain/CSVImporterV2.kt @@ -2,22 +2,22 @@ package com.ivy.importdata.csv.domain import androidx.compose.ui.graphics.toArgb import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.Category -import com.ivy.legacy.datamodel.temp.toDomain -import com.ivy.design.IVY_COLOR_PICKER_COLORS_FREE -import com.ivy.importdata.csv.ImportantFields -import com.ivy.importdata.csv.OptionalFields -import com.ivy.importdata.csv.TransferFields -import com.ivy.legacy.datamodel.toEntity -import com.ivy.legacy.utils.toLowerCaseLocal +import com.ivy.base.model.TransactionType import com.ivy.data.db.dao.read.AccountDao import com.ivy.data.db.dao.read.CategoryDao import com.ivy.data.db.dao.read.SettingsDao import com.ivy.data.db.dao.write.WriteAccountDao import com.ivy.data.db.dao.write.WriteCategoryDao import com.ivy.data.db.dao.write.WriteTransactionDao -import com.ivy.base.model.TransactionType +import com.ivy.design.IVY_COLOR_PICKER_COLORS_FREE +import com.ivy.importdata.csv.ImportantFields +import com.ivy.importdata.csv.OptionalFields +import com.ivy.importdata.csv.TransferFields +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.Category +import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.legacy.datamodel.toEntity +import com.ivy.legacy.utils.toLowerCaseLocal import com.ivy.wallet.domain.data.IvyCurrency import com.ivy.wallet.domain.deprecated.logic.csv.model.CSVRow import com.ivy.wallet.domain.deprecated.logic.csv.model.ImportResult diff --git a/screen-import-data/src/main/java/com/ivy/importdata/csv/domain/ParseFields.kt b/screen-import-data/src/main/java/com/ivy/importdata/csv/domain/ParseFields.kt index 84e89a80a0..56d285d31f 100644 --- a/screen-import-data/src/main/java/com/ivy/importdata/csv/domain/ParseFields.kt +++ b/screen-import-data/src/main/java/com/ivy/importdata/csv/domain/ParseFields.kt @@ -1,10 +1,10 @@ package com.ivy.importdata.csv.domain +import com.ivy.base.model.TransactionType import com.ivy.importdata.csv.CSVRow import com.ivy.importdata.csv.ColumnMapping import com.ivy.importdata.csv.DateMetadata import com.ivy.importdata.csv.TrnTypeMetadata -import com.ivy.base.model.TransactionType import java.text.DecimalFormat import java.text.NumberFormat import java.time.LocalDateTime @@ -62,7 +62,7 @@ fun parseTransactionType( ): TransactionType? { fun String.tryMeta(metaContains: String): Boolean { return metaContains.isNotBlank() && - this.contains(metaContains.trim(), ignoreCase = true) + this.contains(metaContains.trim(), ignoreCase = true) } return tryParse { diff --git a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/ImportScreen.kt b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/ImportScreen.kt index 8b01a1ab40..067e183d2e 100644 --- a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/ImportScreen.kt +++ b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/ImportScreen.kt @@ -12,10 +12,10 @@ import com.ivy.importdata.csvimport.flow.ImportFrom import com.ivy.importdata.csvimport.flow.ImportProcessing import com.ivy.importdata.csvimport.flow.ImportResultUI import com.ivy.importdata.csvimport.flow.instructions.ImportInstructions +import com.ivy.legacy.domain.deprecated.logic.csv.model.ImportType import com.ivy.navigation.ImportScreen import com.ivy.onboarding.viewmodel.OnboardingViewModel import com.ivy.wallet.domain.deprecated.logic.csv.model.ImportResult -import com.ivy.legacy.domain.deprecated.logic.csv.model.ImportType @OptIn(ExperimentalStdlibApi::class) @ExperimentalFoundationApi diff --git a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportFrom.kt b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportFrom.kt index d7f2cc566e..ab87023a29 100644 --- a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportFrom.kt +++ b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportFrom.kt @@ -29,9 +29,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.navigation.navigation import com.ivy.legacy.domain.deprecated.logic.csv.model.ImportType import com.ivy.navigation.CSVScreen +import com.ivy.navigation.navigation import com.ivy.onboarding.components.OnboardingToolbar import com.ivy.resources.R import com.ivy.wallet.ui.theme.components.GradientCutBottom diff --git a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportProcessing.kt b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportProcessing.kt index fe234c8152..e6da887cf5 100644 --- a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportProcessing.kt +++ b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportProcessing.kt @@ -19,8 +19,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletPreview +import com.ivy.resources.R import com.ivy.wallet.ui.theme.GradientGreen import com.ivy.wallet.ui.theme.Gray import com.ivy.wallet.ui.theme.components.IvyDividerLine diff --git a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportResultUI.kt b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportResultUI.kt index ee23f5cf8d..56b7aa025f 100644 --- a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportResultUI.kt +++ b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportResultUI.kt @@ -17,9 +17,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.navigation.navigation import com.ivy.legacy.utils.format import com.ivy.navigation.CSVScreen +import com.ivy.navigation.navigation import com.ivy.resources.R import com.ivy.wallet.domain.deprecated.logic.csv.model.ImportResult import com.ivy.wallet.ui.theme.GradientIvy @@ -58,7 +58,7 @@ fun ImportResultUI( Spacer(Modifier.height(24.dp)) val importSuccess = result.transactionsImported > 0 && - result.transactionsImported > result.rowsFound / 2 + result.transactionsImported > result.rowsFound / 2 Text( modifier = Modifier.padding(horizontal = 32.dp), text = if (importSuccess) stringResource(R.string.success) else stringResource(R.string.failure), diff --git a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportSteps.kt b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportSteps.kt index 0781614cb0..0d327cf806 100644 --- a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportSteps.kt +++ b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/ImportSteps.kt @@ -64,4 +64,4 @@ fun ImportType.ImportSteps( onUploadClick = onUploadClick ) } -} \ No newline at end of file +} diff --git a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/instructions/ImportInstructions.kt b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/instructions/ImportInstructions.kt index c603c19e71..11e29310ea 100644 --- a/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/instructions/ImportInstructions.kt +++ b/screen-import-data/src/main/java/com/ivy/importdata/csvimport/flow/instructions/ImportInstructions.kt @@ -32,11 +32,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.navigation.navigation import com.ivy.importdata.csvimport.flow.ImportSteps +import com.ivy.legacy.domain.deprecated.logic.csv.model.ImportType +import com.ivy.legacy.utils.drawColoredShadow +import com.ivy.navigation.navigation import com.ivy.onboarding.components.OnboardingToolbar import com.ivy.resources.R -import com.ivy.legacy.domain.deprecated.logic.csv.model.ImportType import com.ivy.wallet.ui.theme.GradientIvy import com.ivy.wallet.ui.theme.Gray import com.ivy.wallet.ui.theme.White @@ -44,7 +45,6 @@ import com.ivy.wallet.ui.theme.components.GradientCutBottom import com.ivy.wallet.ui.theme.components.IvyDividerLine import com.ivy.wallet.ui.theme.components.IvyIcon import com.ivy.wallet.ui.theme.components.OnboardingButton -import com.ivy.legacy.utils.drawColoredShadow @ExperimentalFoundationApi @Composable diff --git a/screen-loans/build.gradle.kts b/screen-loans/build.gradle.kts index 6d35dcac28..9b44693443 100644 --- a/screen-loans/build.gradle.kts +++ b/screen-loans/build.gradle.kts @@ -16,4 +16,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-loans/src/main/java/com/ivy/loans/loan/LoanScreenState.kt b/screen-loans/src/main/java/com/ivy/loans/loan/LoanScreenState.kt index dd656206d5..4c57b0351f 100644 --- a/screen-loans/src/main/java/com/ivy/loans/loan/LoanScreenState.kt +++ b/screen-loans/src/main/java/com/ivy/loans/loan/LoanScreenState.kt @@ -14,4 +14,4 @@ data class LoanScreenState( val reorderModalVisible: Boolean, val totalOweAmount: String, val totalOwedAmount: String -) \ No newline at end of file +) diff --git a/screen-loans/src/main/java/com/ivy/loans/loan/LoanViewModel.kt b/screen-loans/src/main/java/com/ivy/loans/loan/LoanViewModel.kt index 43b25473fd..51995c1e45 100644 --- a/screen-loans/src/main/java/com/ivy/loans/loan/LoanViewModel.kt +++ b/screen-loans/src/main/java/com/ivy/loans/loan/LoanViewModel.kt @@ -289,4 +289,4 @@ class LoanViewModel @Inject constructor( return amount } -} \ No newline at end of file +} diff --git a/screen-main/build.gradle.kts b/screen-main/build.gradle.kts index 2de46f7ca0..48b5e3a100 100644 --- a/screen-main/build.gradle.kts +++ b/screen-main/build.gradle.kts @@ -22,4 +22,4 @@ dependencies { implementation(projects.tempLegacyCode) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-main/src/main/java/com/ivy/main/MainBottomBar.kt b/screen-main/src/main/java/com/ivy/main/MainBottomBar.kt index 5f7dd64196..862bd45f75 100644 --- a/screen-main/src/main/java/com/ivy/main/MainBottomBar.kt +++ b/screen-main/src/main/java/com/ivy/main/MainBottomBar.kt @@ -162,7 +162,7 @@ fun BoxWithConstraintsScope.BottomBar( // ------------------------------------ BUTTONS-------------------------------------------------- val fabStartX = ivyContext.screenWidth / 2 - FAB_BUTTON_SIZE.toDensityPx() / 2 val fabStartY = ivyContext.screenHeight - navigationBarInset() - - 30.dp.toDensityPx() - FAB_BUTTON_SIZE.toDensityPx() + 30.dp.toDensityPx() - FAB_BUTTON_SIZE.toDensityPx() TransactionButtons( buttonsShownPercent = buttonsShownPercent, @@ -211,21 +211,21 @@ fun BoxWithConstraintsScope.BottomBar( when { abs(dragOffset.x) < horizontalThreshold && - dragOffset.y < -verticalThreshold -> { + dragOffset.y < -verticalThreshold -> { // swipe up dragOffset = Offset.Zero // prevent double open of the screen onAddExpense() } dragOffset.x < -horizontalThreshold && - dragOffset.y < -verticalThreshold -> { + dragOffset.y < -verticalThreshold -> { // swipe up left dragOffset = Offset.Zero // prevent double open of the screen onAddIncome() } dragOffset.x > horizontalThreshold && - dragOffset.y < -verticalThreshold -> { + dragOffset.y < -verticalThreshold -> { // swipe up right dragOffset = Offset.Zero // prevent double open of the screen onAddTransfer() diff --git a/screen-main/src/main/java/com/ivy/main/MainScreen.kt b/screen-main/src/main/java/com/ivy/main/MainScreen.kt index 3b5fc799b9..f2dd59bbe7 100644 --- a/screen-main/src/main/java/com/ivy/main/MainScreen.kt +++ b/screen-main/src/main/java/com/ivy/main/MainScreen.kt @@ -12,6 +12,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.tooling.preview.Preview import androidx.lifecycle.viewmodel.compose.viewModel import com.ivy.accounts.AccountsTab +import com.ivy.base.model.TransactionType import com.ivy.home.HomeTab import com.ivy.legacy.IvyWalletPreview import com.ivy.legacy.data.model.MainTab @@ -21,7 +22,6 @@ import com.ivy.navigation.EditPlannedScreen import com.ivy.navigation.EditTransactionScreen import com.ivy.navigation.MainScreen import com.ivy.navigation.navigation -import com.ivy.base.model.TransactionType import com.ivy.wallet.domain.deprecated.logic.model.CreateAccountData import com.ivy.wallet.ui.theme.modal.edit.AccountModal import com.ivy.wallet.ui.theme.modal.edit.AccountModalData diff --git a/screen-main/src/main/java/com/ivy/main/MainViewModel.kt b/screen-main/src/main/java/com/ivy/main/MainViewModel.kt index 501f1bab5d..1c2497aa94 100644 --- a/screen-main/src/main/java/com/ivy/main/MainViewModel.kt +++ b/screen-main/src/main/java/com/ivy/main/MainViewModel.kt @@ -3,6 +3,7 @@ package com.ivy.main import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import com.ivy.data.db.dao.read.SettingsDao import com.ivy.domain.event.AccountUpdatedEvent import com.ivy.domain.event.EventBus import com.ivy.frp.test.TestIdlingResource @@ -15,7 +16,6 @@ import com.ivy.legacy.utils.asLiveData import com.ivy.legacy.utils.ioThread import com.ivy.navigation.MainScreen import com.ivy.navigation.Navigation -import com.ivy.data.db.dao.read.SettingsDao import com.ivy.wallet.domain.deprecated.logic.model.CreateAccountData import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch diff --git a/screen-onboarding/build.gradle.kts b/screen-onboarding/build.gradle.kts index 600500eef0..08626ed3de 100644 --- a/screen-onboarding/build.gradle.kts +++ b/screen-onboarding/build.gradle.kts @@ -16,4 +16,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-onboarding/src/main/java/com/ivy/onboarding/OnboardingEvent.kt b/screen-onboarding/src/main/java/com/ivy/onboarding/OnboardingEvent.kt index a699b4f704..3741e7a571 100644 --- a/screen-onboarding/src/main/java/com/ivy/onboarding/OnboardingEvent.kt +++ b/screen-onboarding/src/main/java/com/ivy/onboarding/OnboardingEvent.kt @@ -23,4 +23,4 @@ sealed interface OnboardingEvent { data class CreateCategory(val data: CreateCategoryData) : OnboardingEvent data object OnAddCategoriesDone : OnboardingEvent data object OnAddCategoriesSkip : OnboardingEvent -} \ No newline at end of file +} diff --git a/screen-onboarding/src/main/java/com/ivy/onboarding/OnboardingScreen.kt b/screen-onboarding/src/main/java/com/ivy/onboarding/OnboardingScreen.kt index 883bd01214..79f7f60f7e 100644 --- a/screen-onboarding/src/main/java/com/ivy/onboarding/OnboardingScreen.kt +++ b/screen-onboarding/src/main/java/com/ivy/onboarding/OnboardingScreen.kt @@ -122,4 +122,4 @@ private fun BoxWithConstraintsScope.UI( ) } } -} \ No newline at end of file +} diff --git a/screen-onboarding/src/main/java/com/ivy/onboarding/components/OnboardingToolbar.kt b/screen-onboarding/src/main/java/com/ivy/onboarding/components/OnboardingToolbar.kt index 7ab3065b7c..7b73709267 100644 --- a/screen-onboarding/src/main/java/com/ivy/onboarding/components/OnboardingToolbar.kt +++ b/screen-onboarding/src/main/java/com/ivy/onboarding/components/OnboardingToolbar.kt @@ -14,8 +14,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview +import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gray import com.ivy.wallet.ui.theme.components.IvyToolbar diff --git a/screen-onboarding/src/main/java/com/ivy/onboarding/components/Suggestions.kt b/screen-onboarding/src/main/java/com/ivy/onboarding/components/Suggestions.kt index c3ef3e4d2b..57ae5beb1b 100644 --- a/screen-onboarding/src/main/java/com/ivy/onboarding/components/Suggestions.kt +++ b/screen-onboarding/src/main/java/com/ivy/onboarding/components/Suggestions.kt @@ -17,11 +17,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.datamodel.Account import com.ivy.design.l0_system.Purple import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.legacy.IvyWalletComponentPreview +import com.ivy.legacy.datamodel.Account import com.ivy.legacy.utils.drawColoredShadow import com.ivy.resources.R import com.ivy.wallet.domain.deprecated.logic.model.CreateAccountData diff --git a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingAccounts.kt b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingAccounts.kt index 16046550bc..4a1c8e133e 100644 --- a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingAccounts.kt +++ b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingAccounts.kt @@ -33,13 +33,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.datamodel.Account import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.navigation.navigation import com.ivy.legacy.IvyWalletPreview import com.ivy.legacy.data.model.AccountBalance +import com.ivy.legacy.datamodel.Account import com.ivy.legacy.utils.toLowerCaseLocal +import com.ivy.navigation.navigation import com.ivy.onboarding.components.OnboardingProgressSlider import com.ivy.onboarding.components.OnboardingToolbar import com.ivy.onboarding.components.Suggestions diff --git a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingCategories.kt b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingCategories.kt index 9c0f4cd38a..1c3831b4d2 100644 --- a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingCategories.kt +++ b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingCategories.kt @@ -33,15 +33,16 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletPreview import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.datamodel.Category +import com.ivy.legacy.utils.toLowerCaseLocal import com.ivy.navigation.navigation import com.ivy.onboarding.components.OnboardingProgressSlider import com.ivy.onboarding.components.OnboardingToolbar import com.ivy.onboarding.components.Suggestions import com.ivy.resources.R -import com.ivy.legacy.datamodel.Category import com.ivy.wallet.domain.deprecated.logic.model.CreateCategoryData import com.ivy.wallet.ui.theme.GradientIvy import com.ivy.wallet.ui.theme.Green @@ -59,7 +60,6 @@ import com.ivy.wallet.ui.theme.findContrastTextColor import com.ivy.wallet.ui.theme.modal.edit.CategoryModal import com.ivy.wallet.ui.theme.modal.edit.CategoryModalData import com.ivy.wallet.ui.theme.toComposeColor -import com.ivy.legacy.utils.toLowerCaseLocal @ExperimentalFoundationApi @Composable diff --git a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSetCurrency.kt b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSetCurrency.kt index de6fd865cb..b17d04b3cb 100644 --- a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSetCurrency.kt +++ b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSetCurrency.kt @@ -23,17 +23,17 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.utils.setStatusBarDarkTextCompat import com.ivy.navigation.navigation import com.ivy.resources.R import com.ivy.wallet.domain.data.IvyCurrency -import com.ivy.legacy.IvyWalletPreview import com.ivy.wallet.ui.theme.GradientIvy import com.ivy.wallet.ui.theme.White import com.ivy.wallet.ui.theme.components.BackButton import com.ivy.wallet.ui.theme.components.CurrencyPicker import com.ivy.wallet.ui.theme.components.GradientCutBottom import com.ivy.wallet.ui.theme.components.OnboardingButton -import com.ivy.legacy.utils.setStatusBarDarkTextCompat @Composable fun BoxWithConstraintsScope.OnboardingSetCurrency( diff --git a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSplashLogin.kt b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSplashLogin.kt index 9c66fea26c..b3a2d3c82d 100644 --- a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSplashLogin.kt +++ b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSplashLogin.kt @@ -343,8 +343,8 @@ private fun LocalAccountExplanation() { Text( modifier = Modifier.padding(start = 32.dp, end = 32.dp), text = "Your data will be saved only locally on your phone. " + - "You risk losing your data if you uninstall the app or change your device. " + - "To prevent data loss, we recommend exporting backup from settings regularly.", + "You risk losing your data if you uninstall the app or change your device. " + + "To prevent data loss, we recommend exporting backup from settings regularly.", style = UI.typo.c.style( color = Gray, fontWeight = FontWeight.Medium diff --git a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingPrivacyTC.kt b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingPrivacyTC.kt index 98437e1127..1c5ef30287 100644 --- a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingPrivacyTC.kt +++ b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingPrivacyTC.kt @@ -37,21 +37,21 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.ivy.design.l0_system.UI +import com.ivy.design.l0_system.style import com.ivy.legacy.Constants import com.ivy.legacy.IvyWalletPreview import com.ivy.legacy.ivyWalletCtx import com.ivy.legacy.rootScreen -import com.ivy.design.l0_system.UI -import com.ivy.design.l0_system.style +import com.ivy.legacy.utils.drawColoredShadow +import com.ivy.legacy.utils.toDensityDp +import com.ivy.legacy.utils.toDensityPx import com.ivy.resources.R import com.ivy.wallet.ui.theme.GradientGreen import com.ivy.wallet.ui.theme.Gray import com.ivy.wallet.ui.theme.Green import com.ivy.wallet.ui.theme.White import com.ivy.wallet.ui.theme.components.IvyIcon -import com.ivy.legacy.utils.drawColoredShadow -import com.ivy.legacy.utils.toDensityDp -import com.ivy.legacy.utils.toDensityPx import timber.log.Timber @Composable diff --git a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingSetName.kt b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingSetName.kt index 227e72276a..a91a11a1b9 100644 --- a/screen-onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingSetName.kt +++ b/screen-onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingSetName.kt @@ -33,20 +33,20 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletPreview import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R -import com.ivy.wallet.ui.theme.GradientIvy -import com.ivy.wallet.ui.theme.White -import com.ivy.wallet.ui.theme.components.IvyOutlinedTextField -import com.ivy.wallet.ui.theme.components.OnboardingButton +import com.ivy.legacy.IvyWalletPreview import com.ivy.legacy.utils.addKeyboardListener import com.ivy.legacy.utils.densityScope import com.ivy.legacy.utils.isNotNullOrBlank import com.ivy.legacy.utils.keyboardOnlyWindowInsets import com.ivy.legacy.utils.onScreenStart import com.ivy.legacy.utils.springBounceSlow +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.GradientIvy +import com.ivy.wallet.ui.theme.White +import com.ivy.wallet.ui.theme.components.IvyOutlinedTextField +import com.ivy.wallet.ui.theme.components.OnboardingButton @Composable fun OnboardingSetName( diff --git a/screen-piechart/build.gradle.kts b/screen-piechart/build.gradle.kts index f4c7266a2d..5ffe7e30d3 100644 --- a/screen-piechart/build.gradle.kts +++ b/screen-piechart/build.gradle.kts @@ -16,4 +16,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-piechart/src/main/java/com/ivy/piechart/PieChart.kt b/screen-piechart/src/main/java/com/ivy/piechart/PieChart.kt index 52a9e66698..546d908228 100644 --- a/screen-piechart/src/main/java/com/ivy/piechart/PieChart.kt +++ b/screen-piechart/src/main/java/com/ivy/piechart/PieChart.kt @@ -298,4 +298,4 @@ private fun Preview() { Spacer(Modifier.weight(1f)) } } -} \ No newline at end of file +} diff --git a/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticBottomBar.kt b/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticBottomBar.kt index cbcb05b2bd..812138ec18 100644 --- a/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticBottomBar.kt +++ b/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticBottomBar.kt @@ -84,4 +84,4 @@ private fun PreviewBottomBar() { onClose = {} ) } -} \ No newline at end of file +} diff --git a/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticEvent.kt b/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticEvent.kt index c38cc6fa53..f0d2d6d1f8 100644 --- a/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticEvent.kt +++ b/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticEvent.kt @@ -11,4 +11,4 @@ sealed interface PieChartStatisticEvent { data class OnSetPeriod(val timePeriod: TimePeriod) : PieChartStatisticEvent data class OnCategoryClicked(val category: Category?) : PieChartStatisticEvent data class OnShowMonthModal(val timePeriod: TimePeriod?) : PieChartStatisticEvent -} \ No newline at end of file +} diff --git a/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticScreen.kt b/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticScreen.kt index bfb79fb2cb..c82f4475a4 100644 --- a/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticScreen.kt +++ b/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticScreen.kt @@ -570,4 +570,4 @@ private fun Preview_Income() { UI(state = state) } -} \ No newline at end of file +} diff --git a/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticState.kt b/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticState.kt index 868584e41b..41828b2759 100644 --- a/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticState.kt +++ b/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticState.kt @@ -21,4 +21,4 @@ data class PieChartStatisticState( val filterExcluded: Boolean, val transactions: ImmutableList, val choosePeriodModal: ChoosePeriodModalData? -) \ No newline at end of file +) diff --git a/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticViewModel.kt b/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticViewModel.kt index e1a5e503d6..bdb8fb5b3f 100644 --- a/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticViewModel.kt +++ b/screen-piechart/src/main/java/com/ivy/piechart/PieChartStatisticViewModel.kt @@ -276,4 +276,4 @@ class PieChartStatisticViewModel @Inject constructor( selectedCategory.value = selectedCategoryValue categoryAmounts.value = newCategoryAmounts } -} \ No newline at end of file +} diff --git a/screen-piechart/src/main/java/com/ivy/piechart/action/PieChartAct.kt b/screen-piechart/src/main/java/com/ivy/piechart/action/PieChartAct.kt index 4fdb5049ae..a19dd02a22 100644 --- a/screen-piechart/src/main/java/com/ivy/piechart/action/PieChartAct.kt +++ b/screen-piechart/src/main/java/com/ivy/piechart/action/PieChartAct.kt @@ -201,20 +201,20 @@ class PieChartAct @Inject constructor( return when (type) { TransactionType.INCOME -> { incExpQuad.income + - if (treatTransferAsIncExp) { - incExpQuad.transferIncome - } else { - BigDecimal.ZERO - } + if (treatTransferAsIncExp) { + incExpQuad.transferIncome + } else { + BigDecimal.ZERO + } } TransactionType.EXPENSE -> { incExpQuad.expense + - if (treatTransferAsIncExp) { - incExpQuad.transferExpense - } else { - BigDecimal.ZERO - } + if (treatTransferAsIncExp) { + incExpQuad.transferExpense + } else { + BigDecimal.ZERO + } } else -> BigDecimal.ZERO @@ -287,4 +287,4 @@ class PieChartAct @Inject constructor( ) data class Output(val totalAmount: Double, val categoryAmounts: ImmutableList) -} \ No newline at end of file +} diff --git a/screen-planned-payments/build.gradle.kts b/screen-planned-payments/build.gradle.kts index d68e461c67..015efa8c9d 100644 --- a/screen-planned-payments/build.gradle.kts +++ b/screen-planned-payments/build.gradle.kts @@ -16,4 +16,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedScreenEvent.kt b/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedScreenEvent.kt index b235641629..652fc96994 100644 --- a/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedScreenEvent.kt +++ b/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedScreenEvent.kt @@ -44,4 +44,4 @@ sealed interface EditPlannedScreenEvent { data class OnAccountModalDataChanged(val accountModalData: AccountModalData?) : EditPlannedScreenEvent -} \ No newline at end of file +} diff --git a/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedScreenState.kt b/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedScreenState.kt index 53119681c9..83f61f588c 100644 --- a/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedScreenState.kt +++ b/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedScreenState.kt @@ -34,4 +34,4 @@ data class EditPlannedScreenState( val recurringRuleModalData: RecurringRuleModalData?, val transactionTypeModalVisible: Boolean, val amountModalVisible: Boolean -) \ No newline at end of file +) diff --git a/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedViewModel.kt b/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedViewModel.kt index ee60aca243..0456cd7482 100644 --- a/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedViewModel.kt +++ b/screen-planned-payments/src/main/java/com/ivy/planned/edit/EditPlannedViewModel.kt @@ -446,9 +446,9 @@ class EditPlannedViewModel @Inject constructor( private fun validateRecurring(): Boolean { return startDate.value != null && - intervalN.value != null && - intervalN.value!! > 0 && - intervalType.value != null + intervalN.value != null && + intervalN.value!! > 0 && + intervalType.value != null } private fun delete() { diff --git a/screen-planned-payments/src/main/java/com/ivy/planned/edit/RecurringRule.kt b/screen-planned-payments/src/main/java/com/ivy/planned/edit/RecurringRule.kt index 2bb58544f3..8742def585 100644 --- a/screen-planned-payments/src/main/java/com/ivy/planned/edit/RecurringRule.kt +++ b/screen-planned-payments/src/main/java/com/ivy/planned/edit/RecurringRule.kt @@ -18,6 +18,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.ivy.data.model.IntervalType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.legacy.IvyWalletComponentPreview @@ -25,7 +26,6 @@ import com.ivy.legacy.forDisplay import com.ivy.legacy.utils.formatDateOnly import com.ivy.legacy.utils.timeNowUTC import com.ivy.legacy.utils.uppercaseLocal -import com.ivy.data.model.IntervalType import com.ivy.resources.R import com.ivy.wallet.ui.theme.Orange import com.ivy.wallet.ui.theme.components.AddPrimaryAttributeButton @@ -73,7 +73,7 @@ fun hasRecurringRule( oneTime: Boolean, ): Boolean { return startDate != null && - ((intervalN != null && intervalType != null) || oneTime) + ((intervalN != null && intervalType != null) || oneTime) } @Composable diff --git a/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentCard.kt b/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentCard.kt index 88e854383c..b9084bda86 100644 --- a/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentCard.kt +++ b/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentCard.kt @@ -24,6 +24,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.ivy.base.model.TransactionType +import com.ivy.data.model.IntervalType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.legacy.IvyWalletPreview @@ -39,8 +41,6 @@ import com.ivy.legacy.utils.timeNowUTC import com.ivy.legacy.utils.uppercaseLocal import com.ivy.navigation.TransactionsScreen import com.ivy.navigation.navigation -import com.ivy.data.model.IntervalType -import com.ivy.base.model.TransactionType import com.ivy.resources.R import com.ivy.wallet.ui.theme.Blue import com.ivy.wallet.ui.theme.Gradient diff --git a/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsBottomBar.kt b/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsBottomBar.kt index daf43a7b29..61e9ebbd1f 100644 --- a/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsBottomBar.kt +++ b/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsBottomBar.kt @@ -12,13 +12,13 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.utils.navigationBarInset +import com.ivy.legacy.utils.toDensityDp import com.ivy.resources.R import com.ivy.wallet.ui.theme.components.ActionsRow import com.ivy.wallet.ui.theme.components.CloseButton import com.ivy.wallet.ui.theme.components.IvyOutlinedButton import com.ivy.wallet.ui.theme.gradientCutBackgroundTop -import com.ivy.legacy.utils.navigationBarInset -import com.ivy.legacy.utils.toDensityDp @Composable fun BoxWithConstraintsScope.PlannedPaymentsBottomBar( diff --git a/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsLazyColumn.kt b/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsLazyColumn.kt index c22a634f11..10e6885a17 100644 --- a/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsLazyColumn.kt +++ b/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsLazyColumn.kt @@ -21,11 +21,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp +import com.ivy.design.l0_system.UI +import com.ivy.design.l0_system.style import com.ivy.legacy.datamodel.Account import com.ivy.legacy.datamodel.Category import com.ivy.legacy.datamodel.PlannedPaymentRule -import com.ivy.design.l0_system.UI -import com.ivy.design.l0_system.style import com.ivy.legacy.ui.component.transaction.SectionDivider import com.ivy.navigation.EditPlannedScreen import com.ivy.navigation.Navigation diff --git a/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsScreenEvent.kt b/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsScreenEvent.kt index 8e4c6cce3a..59088d246e 100644 --- a/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsScreenEvent.kt +++ b/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsScreenEvent.kt @@ -3,4 +3,4 @@ package com.ivy.planned.list sealed interface PlannedPaymentsScreenEvent { data class OnOneTimePaymentsExpanded(val isExpanded: Boolean) : PlannedPaymentsScreenEvent data class OnRecurringPaymentsExpanded(val isExpanded: Boolean) : PlannedPaymentsScreenEvent -} \ No newline at end of file +} diff --git a/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsScreenState.kt b/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsScreenState.kt index 7429521618..3e37334240 100644 --- a/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsScreenState.kt +++ b/screen-planned-payments/src/main/java/com/ivy/planned/list/PlannedPaymentsScreenState.kt @@ -19,4 +19,4 @@ data class PlannedPaymentsScreenState( val recurringExpenses: Double, val isOneTimePaymentsExpanded: Boolean, val isRecurringPaymentsExpanded: Boolean -) \ No newline at end of file +) diff --git a/screen-releases/build.gradle.kts b/screen-releases/build.gradle.kts index 1cb1f0ae36..5ca43cdc91 100644 --- a/screen-releases/build.gradle.kts +++ b/screen-releases/build.gradle.kts @@ -17,4 +17,4 @@ dependencies { implementation(libs.bundles.ktor) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-releases/src/main/java/com/ivy/releases/ReleasesContentParser.kt b/screen-releases/src/main/java/com/ivy/releases/ReleasesContentParser.kt index b2d11a7a56..8b288cecc6 100644 --- a/screen-releases/src/main/java/com/ivy/releases/ReleasesContentParser.kt +++ b/screen-releases/src/main/java/com/ivy/releases/ReleasesContentParser.kt @@ -24,4 +24,4 @@ class ReleasesContentParser @Inject constructor() { // e.g. transforms original "2023-09-16T17:42:08Z" into "2023-09-16" return date.dropLast(REDUNDANT_CHARS_COUNT) } -} \ No newline at end of file +} diff --git a/screen-releases/src/main/java/com/ivy/releases/ReleasesDataSource.kt b/screen-releases/src/main/java/com/ivy/releases/ReleasesDataSource.kt index 5477649f76..749abe635d 100644 --- a/screen-releases/src/main/java/com/ivy/releases/ReleasesDataSource.kt +++ b/screen-releases/src/main/java/com/ivy/releases/ReleasesDataSource.kt @@ -37,4 +37,4 @@ class ReleasesDataSource @Inject constructor( null } } -} \ No newline at end of file +} diff --git a/screen-releases/src/main/java/com/ivy/releases/ReleasesEvent.kt b/screen-releases/src/main/java/com/ivy/releases/ReleasesEvent.kt index cec869ee15..e25c2eabeb 100644 --- a/screen-releases/src/main/java/com/ivy/releases/ReleasesEvent.kt +++ b/screen-releases/src/main/java/com/ivy/releases/ReleasesEvent.kt @@ -2,4 +2,4 @@ package com.ivy.releases sealed interface ReleasesEvent { data object OnTryAgainClick : ReleasesEvent -} \ No newline at end of file +} diff --git a/screen-releases/src/main/java/com/ivy/releases/ReleasesScreen.kt b/screen-releases/src/main/java/com/ivy/releases/ReleasesScreen.kt index 6b9ef87718..0c7d508aae 100644 --- a/screen-releases/src/main/java/com/ivy/releases/ReleasesScreen.kt +++ b/screen-releases/src/main/java/com/ivy/releases/ReleasesScreen.kt @@ -247,4 +247,4 @@ private fun GitHubButton( contentDescription = "GitHub" ) } -} \ No newline at end of file +} diff --git a/screen-releases/src/main/java/com/ivy/releases/ReleasesViewModel.kt b/screen-releases/src/main/java/com/ivy/releases/ReleasesViewModel.kt index bbedc33104..a46bc83628 100644 --- a/screen-releases/src/main/java/com/ivy/releases/ReleasesViewModel.kt +++ b/screen-releases/src/main/java/com/ivy/releases/ReleasesViewModel.kt @@ -62,4 +62,4 @@ class ReleasesViewModel @Inject constructor( releaseState.value = ReleasesState.Success(releasesInfo = releaseInfo) } -} \ No newline at end of file +} diff --git a/screen-releases/src/test/java/com/ivy/releases/ReleasesContentParserTest.kt b/screen-releases/src/test/java/com/ivy/releases/ReleasesContentParserTest.kt index 8936f12280..ae17d68158 100644 --- a/screen-releases/src/test/java/com/ivy/releases/ReleasesContentParserTest.kt +++ b/screen-releases/src/test/java/com/ivy/releases/ReleasesContentParserTest.kt @@ -9,8 +9,8 @@ class ReleasesContentParserTest : FreeSpec({ "toCommitsList" - { val commits = "- c9a985eb Add `GitHubWorkerMigration` and bump version to \"4.4.2\" " + - "(142)\n - e6e001e8 Update dev-request.yml\n - 2d397ca1 Update bug_report.yml\n " + - "- 2c386031 Update and rename dev-contributor-request.yml to dev-request.yml" + "(142)\n - e6e001e8 Update dev-request.yml\n - 2d397ca1 Update bug_report.yml\n " + + "- 2c386031 Update and rename dev-contributor-request.yml to dev-request.yml" "with null commits input" { releasesContentParser.toCommitsList(null) shouldBe persistentListOf() @@ -37,4 +37,4 @@ class ReleasesContentParserTest : FreeSpec({ releasesContentParser.toReleaseDate(date) shouldBe "2023-09-16" } } -}) \ No newline at end of file +}) diff --git a/screen-reports/build.gradle.kts b/screen-reports/build.gradle.kts index a74b2eaccd..1e72f91d25 100644 --- a/screen-reports/build.gradle.kts +++ b/screen-reports/build.gradle.kts @@ -16,4 +16,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-reports/src/main/java/com/ivy/reports/FilterOverlay.kt b/screen-reports/src/main/java/com/ivy/reports/FilterOverlay.kt index 572a9f84ab..0f6f7217d3 100644 --- a/screen-reports/src/main/java/com/ivy/reports/FilterOverlay.kt +++ b/screen-reports/src/main/java/com/ivy/reports/FilterOverlay.kt @@ -34,16 +34,16 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.Category -import com.ivy.domain.legacy.ui.theme.components.ListItem +import com.ivy.base.model.TransactionType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.domain.legacy.ui.theme.components.ListItem import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.Category import com.ivy.legacy.ivyWalletCtx import com.ivy.legacy.utils.capitalizeLocal import com.ivy.legacy.utils.springBounce -import com.ivy.base.model.TransactionType import com.ivy.resources.R import com.ivy.wallet.ui.theme.GradientGreen import com.ivy.wallet.ui.theme.Green @@ -721,7 +721,7 @@ private fun KeywordsFilter( FilterTitleText( text = stringResource(R.string.keywords_optional), active = filter != null && - (filter.includeKeywords.isNotEmpty() || filter.excludeKeywords.isNotEmpty()) + (filter.includeKeywords.isNotEmpty() || filter.excludeKeywords.isNotEmpty()) ) Spacer(Modifier.height(12.dp)) diff --git a/screen-reports/src/main/java/com/ivy/reports/ReportFilter.kt b/screen-reports/src/main/java/com/ivy/reports/ReportFilter.kt index 585942e21d..9fd3aca515 100644 --- a/screen-reports/src/main/java/com/ivy/reports/ReportFilter.kt +++ b/screen-reports/src/main/java/com/ivy/reports/ReportFilter.kt @@ -1,9 +1,9 @@ package com.ivy.reports +import com.ivy.base.model.TransactionType +import com.ivy.legacy.data.model.TimePeriod import com.ivy.legacy.datamodel.Account import com.ivy.legacy.datamodel.Category -import com.ivy.legacy.data.model.TimePeriod -import com.ivy.base.model.TransactionType import java.util.UUID data class ReportFilter( diff --git a/screen-reports/src/main/java/com/ivy/reports/ReportViewModel.kt b/screen-reports/src/main/java/com/ivy/reports/ReportViewModel.kt index 6f1586dcf1..f039061ac5 100644 --- a/screen-reports/src/main/java/com/ivy/reports/ReportViewModel.kt +++ b/screen-reports/src/main/java/com/ivy/reports/ReportViewModel.kt @@ -150,7 +150,7 @@ class ReportViewModel @Inject constructor( private suspend fun setFilter(reportFilter: ReportFilter?) { scopedIOThread { scope -> if (reportFilter == null) { - //clear filter + // clear filter filter.value = null return@scopedIOThread } @@ -189,10 +189,10 @@ class ReportViewModel @Inject constructor( ) val tempIncome = historyIncomeExpense.value.income.toDouble() + - if (treatTransfersAsIncExp.value) historyIncomeExpense.value.transferIncome.toDouble() else 0.0 + if (treatTransfersAsIncExp.value) historyIncomeExpense.value.transferIncome.toDouble() else 0.0 val tempExpenses = historyIncomeExpense.value.expense.toDouble() + - if (treatTransfersAsIncExp.value) historyIncomeExpense.value.transferExpense.toDouble() else 0.0 + if (treatTransfersAsIncExp.value) historyIncomeExpense.value.transferExpense.toDouble() else 0.0 val tempBalance = calculateBalance(historyIncomeExpense.value).toDouble() @@ -200,7 +200,7 @@ class ReportViewModel @Inject constructor( val timeNowUTC = timeNowUTC() - //Upcoming + // Upcoming val upcomingTransactionsList = transactionsList .filter { it.dueDate != null && it.dueDate!!.isAfter(timeNowUTC) @@ -215,7 +215,7 @@ class ReportViewModel @Inject constructor( baseCurrency = baseCurrency ) ) - //Overdue + // Overdue val overdue = transactionsList.filter { it.dueDate != null && it.dueDate!!.isBefore(timeNowUTC) }.sortedByDescending { @@ -263,31 +263,31 @@ class ReportViewModel @Inject constructor( .findAll() .map { it.toDomain() } .filter { - //Filter by Transaction Type + // Filter by Transaction Type filter.trnTypes.contains(it.type) } .filter { - //Filter by Time Period + // Filter by Time Period filterRange ?: return@filter false (it.dateTime != null && filterRange.includes(it.dateTime!!)) || - (it.dueDate != null && filterRange.includes(it.dueDate!!)) + (it.dueDate != null && filterRange.includes(it.dueDate!!)) } .filter { trn -> - //Filter by Accounts + // Filter by Accounts - filterAccountIds.contains(trn.accountId) || //Transfers Out - (trn.toAccountId != null && filterAccountIds.contains(trn.toAccountId)) //Transfers In + filterAccountIds.contains(trn.accountId) || // Transfers Out + (trn.toAccountId != null && filterAccountIds.contains(trn.toAccountId)) // Transfers In } .filter { trn -> - //Filter by Categories + // Filter by Categories filterCategoryIds.contains(trn.categoryId) || (trn.type == TransactionType.TRANSFER) } .filterSuspend { - //Filter by Amount - //!NOTE: Amount must be converted to baseCurrency amount + // Filter by Amount + // !NOTE: Amount must be converted to baseCurrency amount val trnAmountBaseCurrency = exchangeAct( ExchangeAct.Input( @@ -300,10 +300,10 @@ class ReportViewModel @Inject constructor( ).orZero().toDouble() (filter.minAmount == null || trnAmountBaseCurrency >= filter.minAmount) && - (filter.maxAmount == null || trnAmountBaseCurrency <= filter.maxAmount) + (filter.maxAmount == null || trnAmountBaseCurrency <= filter.maxAmount) } .filter { - //Filter by Included Keywords + // Filter by Included Keywords val includeKeywords = filter.includeKeywords if (includeKeywords.isEmpty()) return@filter true @@ -327,7 +327,7 @@ class ReportViewModel @Inject constructor( false } .filter { - //Filter by Excluded Keywords + // Filter by Excluded Keywords val excludedKeywords = filter.excludeKeywords if (excludedKeywords.isEmpty()) return@filter true @@ -416,11 +416,11 @@ class ReportViewModel @Inject constructor( } private fun onTreatTransfersAsIncomeExpense(transfersAsIncExp: Boolean) { - income.doubleValue = historyIncomeExpense.value.income.toDouble() + - if (transfersAsIncExp) historyIncomeExpense.value.transferIncome.toDouble() else 0.0 - expenses.doubleValue = historyIncomeExpense.value.expense.toDouble() + - if (transfersAsIncExp) historyIncomeExpense.value.transferExpense.toDouble() else 0.0 - treatTransfersAsIncExp.value = transfersAsIncExp + income.doubleValue = historyIncomeExpense.value.income.toDouble() + + if (transfersAsIncExp) historyIncomeExpense.value.transferIncome.toDouble() else 0.0 + expenses.doubleValue = historyIncomeExpense.value.expense.toDouble() + + if (transfersAsIncExp) historyIncomeExpense.value.transferExpense.toDouble() else 0.0 + treatTransfersAsIncExp.value = transfersAsIncExp } private suspend fun skipTransaction(transaction: Transaction) { diff --git a/screen-search/build.gradle.kts b/screen-search/build.gradle.kts index d81dd29cec..9c1efb4d25 100644 --- a/screen-search/build.gradle.kts +++ b/screen-search/build.gradle.kts @@ -16,4 +16,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-search/src/main/java/com/ivy/search/SearchEvent.kt b/screen-search/src/main/java/com/ivy/search/SearchEvent.kt index 2d8c68f599..90739ec3a4 100644 --- a/screen-search/src/main/java/com/ivy/search/SearchEvent.kt +++ b/screen-search/src/main/java/com/ivy/search/SearchEvent.kt @@ -2,4 +2,4 @@ package com.ivy.search sealed interface SearchEvent { data class Search(val query: String) : SearchEvent -} \ No newline at end of file +} diff --git a/screen-search/src/main/java/com/ivy/search/SearchScreen.kt b/screen-search/src/main/java/com/ivy/search/SearchScreen.kt index bd8fc8b8c7..50337b9c5d 100644 --- a/screen-search/src/main/java/com/ivy/search/SearchScreen.kt +++ b/screen-search/src/main/java/com/ivy/search/SearchScreen.kt @@ -120,7 +120,6 @@ private fun SearchUi( } } - @Preview @Composable private fun Preview() { diff --git a/screen-search/src/main/java/com/ivy/search/SearchState.kt b/screen-search/src/main/java/com/ivy/search/SearchState.kt index f8b82a1ebc..83f224e629 100644 --- a/screen-search/src/main/java/com/ivy/search/SearchState.kt +++ b/screen-search/src/main/java/com/ivy/search/SearchState.kt @@ -10,4 +10,4 @@ data class SearchState( val baseCurrency: String, val accounts: ImmutableList, val categories: ImmutableList -) \ No newline at end of file +) diff --git a/screen-search/src/main/java/com/ivy/search/SearchViewModel.kt b/screen-search/src/main/java/com/ivy/search/SearchViewModel.kt index 8dd99ea03a..a26172734f 100644 --- a/screen-search/src/main/java/com/ivy/search/SearchViewModel.kt +++ b/screen-search/src/main/java/com/ivy/search/SearchViewModel.kt @@ -65,7 +65,7 @@ class SearchViewModel @Inject constructor( val filteredTransactions = allTrnsAct(Unit) .filter { transaction -> transaction.title.matchesQuery(normalizedQuery) || - transaction.description.matchesQuery(normalizedQuery) + transaction.description.matchesQuery(normalizedQuery) } trnsWithDateDivsAct( TrnsWithDateDivsAct.Input( diff --git a/screen-settings/build.gradle.kts b/screen-settings/build.gradle.kts index 2dfa78db45..ae8dab116f 100644 --- a/screen-settings/build.gradle.kts +++ b/screen-settings/build.gradle.kts @@ -17,4 +17,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-settings/src/main/java/com/ivy/settings/SettingsEvent.kt b/screen-settings/src/main/java/com/ivy/settings/SettingsEvent.kt index 7ec000722f..dbac2c09fe 100644 --- a/screen-settings/src/main/java/com/ivy/settings/SettingsEvent.kt +++ b/screen-settings/src/main/java/com/ivy/settings/SettingsEvent.kt @@ -11,10 +11,11 @@ sealed interface SettingsEvent { data class SetLockApp(val lockApp: Boolean) : SettingsEvent data class SetShowNotifications(val showNotifications: Boolean) : SettingsEvent data class SetHideCurrentBalance(val hideCurrentBalance: Boolean) : SettingsEvent + data class SetHideIncome(val hideIncome: Boolean) : SettingsEvent data class SetTransfersAsIncomeExpense(val treatTransfersAsIncomeExpense: Boolean) : SettingsEvent data class SetStartDateOfMonth(val startDate: Int) : SettingsEvent data object DeleteCloudUserData : SettingsEvent data object DeleteAllUserData : SettingsEvent -} \ No newline at end of file +} diff --git a/screen-settings/src/main/java/com/ivy/settings/SettingsScreen.kt b/screen-settings/src/main/java/com/ivy/settings/SettingsScreen.kt index 0787e8a343..1c2c00b840 100644 --- a/screen-settings/src/main/java/com/ivy/settings/SettingsScreen.kt +++ b/screen-settings/src/main/java/com/ivy/settings/SettingsScreen.kt @@ -94,6 +94,7 @@ fun BoxWithConstraintsScope.SettingsScreen() { lockApp = uiState.lockApp, showNotifications = uiState.showNotifications, hideCurrentBalance = uiState.hideCurrentBalance, + hideIncome = uiState.hideIncome, progressState = uiState.progressState, treatTransfersAsIncomeExpense = uiState.treatTransfersAsIncomeExpense, nameLocalAccount = uiState.name, @@ -119,6 +120,9 @@ fun BoxWithConstraintsScope.SettingsScreen() { onSetHideCurrentBalance = { viewModel.onEvent(SettingsEvent.SetHideCurrentBalance(it)) }, + onSetHideIncome = { + viewModel.onEvent(SettingsEvent.SetHideIncome(it)) + }, onSetStartDateOfMonth = { viewModel.onEvent(SettingsEvent.SetStartDateOfMonth(it)) }, @@ -146,6 +150,7 @@ private fun BoxWithConstraintsScope.UI( startDateOfMonth: Int = 1, showNotifications: Boolean = true, hideCurrentBalance: Boolean = false, + hideIncome: Boolean = false, progressState: Boolean = false, treatTransfersAsIncomeExpense: Boolean = false, onSetName: (String) -> Unit = {}, @@ -155,11 +160,12 @@ private fun BoxWithConstraintsScope.UI( onSetShowNotifications: (Boolean) -> Unit = {}, onSetTreatTransfersAsIncExp: (Boolean) -> Unit = {}, onSetHideCurrentBalance: (Boolean) -> Unit = {}, + onSetHideIncome: (Boolean) -> Unit = {}, onSetStartDateOfMonth: (Int) -> Unit = {}, onDeleteAllUserData: () -> Unit = {}, onDeleteCloudUserData: () -> Unit = {}, - ) { +) { var currencyModalVisible by remember { mutableStateOf(false) } var nameModalVisible by remember { mutableStateOf(false) } var chooseStartDateOfMonthVisible by remember { mutableStateOf(false) } @@ -331,6 +337,16 @@ private fun BoxWithConstraintsScope.UI( Spacer(Modifier.height(12.dp)) + AppSwitch( + lockApp = hideIncome, + onSetLockApp = onSetHideIncome, + text = stringResource(R.string.hide_income), + description = stringResource(R.string.hide_income_description), + icon = R.drawable.ic_hide_m + ) + + Spacer(Modifier.height(12.dp)) + AppSwitch( lockApp = treatTransfersAsIncomeExpense, onSetLockApp = onSetTreatTransfersAsIncExp, @@ -791,7 +807,6 @@ private fun AccountCard( } } - @Composable private fun AccountCardLocalAccount( name: String? @@ -1143,4 +1158,4 @@ private fun Preview() { onSetCurrency = {}, ) } -} \ No newline at end of file +} diff --git a/screen-settings/src/main/java/com/ivy/settings/SettingsState.kt b/screen-settings/src/main/java/com/ivy/settings/SettingsState.kt index d64c685db9..39384b95eb 100644 --- a/screen-settings/src/main/java/com/ivy/settings/SettingsState.kt +++ b/screen-settings/src/main/java/com/ivy/settings/SettingsState.kt @@ -9,6 +9,7 @@ data class SettingsState( val lockApp: Boolean, val showNotifications: Boolean, val hideCurrentBalance: Boolean, + val hideIncome: Boolean, val treatTransfersAsIncomeExpense: Boolean, val startDateOfMonth: String, val progressState: Boolean diff --git a/screen-settings/src/main/java/com/ivy/settings/SettingsViewModel.kt b/screen-settings/src/main/java/com/ivy/settings/SettingsViewModel.kt index 9caaed2957..c802e7becd 100644 --- a/screen-settings/src/main/java/com/ivy/settings/SettingsViewModel.kt +++ b/screen-settings/src/main/java/com/ivy/settings/SettingsViewModel.kt @@ -9,6 +9,8 @@ import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.viewModelScope import com.ivy.base.legacy.Theme import com.ivy.base.legacy.refreshWidget +import com.ivy.data.db.dao.read.SettingsDao +import com.ivy.data.db.dao.write.WriteSettingsDao import com.ivy.domain.ComposeViewModel import com.ivy.domain.RootScreen import com.ivy.frp.monad.Res @@ -22,8 +24,6 @@ import com.ivy.legacy.utils.formatNicelyWithTime import com.ivy.legacy.utils.ioThread import com.ivy.legacy.utils.timeNowUTC import com.ivy.legacy.utils.uiThread -import com.ivy.data.db.dao.read.SettingsDao -import com.ivy.data.db.dao.write.WriteSettingsDao import com.ivy.wallet.domain.action.global.StartDayOfMonthAct import com.ivy.wallet.domain.action.global.UpdateStartDayOfMonthAct import com.ivy.wallet.domain.action.settings.SettingsAct @@ -60,6 +60,7 @@ class SettingsViewModel @Inject constructor( private val lockApp = mutableStateOf(false) private val showNotifications = mutableStateOf(true) private val hideCurrentBalance = mutableStateOf(false) + private val hideIncome = mutableStateOf(false) private val treatTransfersAsIncomeExpense = mutableStateOf(false) private val startDateOfMonth = mutableIntStateOf(1) private val progressState = mutableStateOf(false) @@ -79,7 +80,8 @@ class SettingsViewModel @Inject constructor( hideCurrentBalance = getHideCurrentBalance(), treatTransfersAsIncomeExpense = getTreatTransfersAsIncomeExpense(), startDateOfMonth = getStartDateOfMonth(), - progressState = getProgressState() + progressState = getProgressState(), + hideIncome = getHideIncome() ) } @@ -90,6 +92,7 @@ class SettingsViewModel @Inject constructor( initializeLockApp() initializeShowNotifications() initializeHideCurrentBalance() + initializeHideIncome() initializeTransfersAsIncomeExpense() initializeStartDateOfMonth() } @@ -129,6 +132,11 @@ class SettingsViewModel @Inject constructor( sharedPrefs.getBoolean(SharedPrefs.HIDE_CURRENT_BALANCE, false) } + private fun initializeHideIncome() { + hideIncome.value = + sharedPrefs.getBoolean(SharedPrefs.HIDE_INCOME, false) + } + private fun initializeTransfersAsIncomeExpense() { treatTransfersAsIncomeExpense.value = sharedPrefs.getBoolean(SharedPrefs.TRANSFERS_AS_INCOME_EXPENSE, false) @@ -168,6 +176,11 @@ class SettingsViewModel @Inject constructor( return hideCurrentBalance.value } + @Composable + private fun getHideIncome(): Boolean { + return hideIncome.value + } + @Composable private fun getTreatTransfersAsIncomeExpense(): Boolean { return treatTransfersAsIncomeExpense.value @@ -196,6 +209,10 @@ class SettingsViewModel @Inject constructor( event.hideCurrentBalance ) + is SettingsEvent.SetHideIncome -> setHideIncome( + event.hideIncome + ) + is SettingsEvent.SetTransfersAsIncomeExpense -> setTransfersAsIncomeExpense( event.treatTransfersAsIncomeExpense ) @@ -326,6 +343,14 @@ class SettingsViewModel @Inject constructor( } } + private fun setHideIncome(isHideIncome: Boolean) { + hideIncome.value = isHideIncome + + viewModelScope.launch { + sharedPrefs.putBoolean(SharedPrefs.HIDE_INCOME, isHideIncome) + } + } + private fun setTransfersAsIncomeExpense(setTransfersAsIncomeExpense: Boolean) { treatTransfersAsIncomeExpense.value = setTransfersAsIncomeExpense @@ -371,4 +396,4 @@ class SettingsViewModel @Inject constructor( logoutLogic.logout() } } -} \ No newline at end of file +} diff --git a/screen-transaction/build.gradle.kts b/screen-transaction/build.gradle.kts index 30adc093cc..332e95089e 100644 --- a/screen-transaction/build.gradle.kts +++ b/screen-transaction/build.gradle.kts @@ -17,4 +17,4 @@ dependencies { implementation(projects.ivyData) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionEvent.kt b/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionEvent.kt index da00b92737..50a28a1041 100644 --- a/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionEvent.kt +++ b/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionEvent.kt @@ -29,4 +29,4 @@ sealed interface EditTransactionEvent { data class Save(val closeScreen: Boolean) : EditTransactionEvent data class SetHasChanges(val hasChangesValue: Boolean) : EditTransactionEvent data class UpdateExchangeRate(val exRate: Double?) : EditTransactionEvent -} \ No newline at end of file +} diff --git a/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionScreen.kt b/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionScreen.kt index 37b03b3cee..a78906bd63 100644 --- a/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionScreen.kt +++ b/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionScreen.kt @@ -72,11 +72,11 @@ import com.ivy.wallet.ui.theme.modal.edit.CategoryModal import com.ivy.wallet.ui.theme.modal.edit.CategoryModalData import com.ivy.wallet.ui.theme.modal.edit.ChooseCategoryModal import com.ivy.wallet.ui.theme.modal.edit.DescriptionModal -import java.time.LocalDate import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableSet import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentSetOf +import java.time.LocalDate import java.time.LocalDateTime import java.time.LocalTime import java.util.UUID @@ -94,7 +94,8 @@ fun BoxWithConstraintsScope.EditTransactionScreen(screen: EditTransactionScreen) val view = rootView() - UI(screen = screen, + UI( + screen = screen, transactionType = uiState.transactionType, baseCurrency = uiState.currency, initialTitle = uiState.initialTitle, @@ -168,7 +169,8 @@ fun BoxWithConstraintsScope.EditTransactionScreen(screen: EditTransactionScreen) }, onExchangeRateChanged = { viewModel.onEvent(EditTransactionEvent.UpdateExchangeRate(it)) - }) + } + ) } @ExperimentalFoundationApi @@ -213,7 +215,7 @@ private fun BoxWithConstraintsScope.UI( backgroundProcessing: Boolean = false, hasChanges: Boolean = false, - ) { +) { var chooseCategoryModalVisible by remember { mutableStateOf(false) } var categoryModalData: CategoryModalData? by remember { mutableStateOf(null) } var accountModalData: AccountModalData? by remember { mutableStateOf(null) } @@ -272,11 +274,13 @@ private fun BoxWithConstraintsScope.UI( }, onChangeTransactionTypeModal = { changeTransactionTypeModalVisible = true - }) + } + ) Spacer(Modifier.height(32.dp)) - Title(type = transactionType, + Title( + type = transactionType, titleFocus = titleFocus, initialTransactionId = screen.initialTransactionId, @@ -298,7 +302,8 @@ private fun BoxWithConstraintsScope.UI( onSave(true) } } - }) + } + ) if (loanData.loanCaption != null) { Spacer(modifier = Modifier.height(8.dp)) @@ -307,7 +312,8 @@ private fun BoxWithConstraintsScope.UI( modifier = Modifier.padding(horizontal = 24.dp), text = loanData.loanCaption!!, style = UI.typo.nB2.style( - color = UI.colors.mediumInverse, fontWeight = FontWeight.Normal + color = UI.colors.mediumInverse, + fontWeight = FontWeight.Normal ) ) } @@ -336,9 +342,11 @@ private fun BoxWithConstraintsScope.UI( Spacer(Modifier.height(12.dp)) } - Description(description = description, + Description( + description = description, onAddDescription = { descriptionModalVisible = true }, - onEditDescription = { descriptionModalVisible = true }) + onEditDescription = { descriptionModalVisible = true } + ) TransactionDateTime(dateTime = dateTime, dueDateTime = dueDate, onEditDate = { ivyContext.datePicker( @@ -354,7 +362,8 @@ private fun BoxWithConstraintsScope.UI( if (transactionType == TransactionType.TRANSFER && customExchangeRateState.showCard) { Spacer(Modifier.height(12.dp)) - CustomExchangeRateCard(fromCurrencyCode = baseCurrency, + CustomExchangeRateCard( + fromCurrencyCode = baseCurrency, toCurrencyCode = customExchangeRateState.toCurrencyCode ?: baseCurrency, exchangeRate = customExchangeRateState.exchangeRate, onRefresh = { @@ -363,7 +372,8 @@ private fun BoxWithConstraintsScope.UI( }, modifier = Modifier.onGloballyPositioned { coordinates -> customExchangeRatePosition = coordinates.positionInParent().y * 0.3f - }) { + } + ) { exchangeRateAmountModalShown = true } } @@ -372,7 +382,8 @@ private fun BoxWithConstraintsScope.UI( Spacer(Modifier.height(12.dp)) val nav = navigation() - AddPrimaryAttributeButton(icon = R.drawable.ic_planned_payments, + AddPrimaryAttributeButton( + icon = R.drawable.ic_planned_payments, text = stringResource(R.string.add_planned_date_payment), onClick = { nav.back() @@ -387,7 +398,8 @@ private fun BoxWithConstraintsScope.UI( description = description, ) ) - }) + } + ) } Spacer(Modifier.height(600.dp)) // scroll hack @@ -399,7 +411,8 @@ private fun BoxWithConstraintsScope.UI( } } - EditBottomSheet(initialTransactionId = screen.initialTransactionId, + EditBottomSheet( + initialTransactionId = screen.initialTransactionId, type = transactionType, accounts = accounts, selectedAccount = account, @@ -474,10 +487,12 @@ private fun BoxWithConstraintsScope.UI( accountModalData = AccountModalData( account = null, baseCurrency = baseCurrency, balance = 0.0 ) - }) + } + ) // Modals - ChooseCategoryModal(visible = chooseCategoryModalVisible, + ChooseCategoryModal( + visible = chooseCategoryModalVisible, initialCategory = category, categories = categories, showCategoryModal = { categoryModalData = CategoryModalData(it) }, @@ -491,7 +506,8 @@ private fun BoxWithConstraintsScope.UI( }, dismiss = { chooseCategoryModalVisible = false - }) + } + ) CategoryModal(modal = categoryModalData, onCreateCategory = { createData -> onCreateCategory(createData) @@ -500,44 +516,54 @@ private fun BoxWithConstraintsScope.UI( categoryModalData = null }) - AccountModal(modal = accountModalData, + AccountModal( + modal = accountModalData, onCreateAccount = onCreateAccount, onEditAccount = { _, _ -> }, dismiss = { accountModalData = null - }) + } + ) - DescriptionModal(visible = descriptionModalVisible, + DescriptionModal( + visible = descriptionModalVisible, description = description, onDescriptionChanged = onDescriptionChanged, dismiss = { descriptionModalVisible = false - }) + } + ) - DeleteModal(visible = deleteTrnModalVisible, + DeleteModal( + visible = deleteTrnModalVisible, title = stringResource(R.string.confirm_deletion), description = stringResource(R.string.transaction_confirm_deletion_description), - dismiss = { deleteTrnModalVisible = false }) { + dismiss = { deleteTrnModalVisible = false } + ) { onDelete() } - ChangeTransactionTypeModal(visible = changeTransactionTypeModalVisible, + ChangeTransactionTypeModal( + visible = changeTransactionTypeModalVisible, includeTransferType = true, initialType = transactionType, dismiss = { changeTransactionTypeModalVisible = false - }) { + } + ) { onSetTransactionType(it) } - DeleteModal(visible = accountChangeModal, + DeleteModal( + visible = accountChangeModal, title = stringResource(R.string.confirm_account_change), description = stringResource(R.string.confirm_account_change_description), buttonText = stringResource(R.string.confirm), iconStart = R.drawable.ic_agreed, dismiss = { accountChangeModal = false - }) { + } + ) { selectedAcc?.let { onAccountChanged(it) } accountChangeModal = false } @@ -548,7 +574,8 @@ private fun BoxWithConstraintsScope.UI( visible = waitModalVisible ) - AmountModal(id = amountModalId, + AmountModal( + id = amountModalId, visible = exchangeRateAmountModalShown, currency = "", initialAmount = customExchangeRateState.exchangeRate, @@ -556,15 +583,18 @@ private fun BoxWithConstraintsScope.UI( decimalCountMax = 4, onAmountChanged = { onExchangeRateChanged(it) - }) + } + ) } private fun shouldFocusCategory( - category: Category?, type: TransactionType + category: Category?, + type: TransactionType ): Boolean = category == null && type != TransactionType.TRANSFER private fun shouldFocusTitle( - titleTextFieldValue: TextFieldValue, type: TransactionType + titleTextFieldValue: TextFieldValue, + type: TransactionType ): Boolean = titleTextFieldValue.text.isBlank() && type != TransactionType.TRANSFER private fun shouldFocusAmount(amount: Double) = amount == 0.0 @@ -574,7 +604,8 @@ private fun shouldFocusAmount(amount: Double) = amount == 0.0 @Composable private fun BoxWithConstraintsScope.Preview() { IvyPreview { - UI(screen = EditTransactionScreen(null, TransactionType.EXPENSE), + UI( + screen = EditTransactionScreen(null, TransactionType.EXPENSE), initialTitle = "", titleSuggestions = persistentSetOf(), baseCurrency = "BGN", @@ -608,6 +639,7 @@ private fun BoxWithConstraintsScope.Preview() { onCreateAccount = { }, onSetDate = {}, onSetTime = {}, - onSetTransactionType = {}) + onSetTransactionType = {} + ) } -} \ No newline at end of file +} diff --git a/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionState.kt b/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionState.kt index e696314173..65679f9545 100644 --- a/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionState.kt +++ b/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionState.kt @@ -29,4 +29,4 @@ data class EditTransactionState( val displayLoanHelper: EditTransactionDisplayLoan, val backgroundProcessingStarted: Boolean, val customExchangeRateState: CustomExchangeRateState -) \ No newline at end of file +) diff --git a/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionViewModel.kt b/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionViewModel.kt index 243a85239d..31eca7f10b 100644 --- a/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionViewModel.kt +++ b/screen-transaction/src/main/java/com/ivy/transaction/EditTransactionViewModel.kt @@ -356,15 +356,15 @@ class EditTransactionViewModel @Inject constructor( val loanWarningDescription = if (isLoanRecord) { "Note: This transaction is associated with a Loan Record of Loan : ${loan.name}\n" + - "You are trying to change the account associated with the loan record to an " + - "account of different currency" + - "\n The Loan Record will be re-calculated based on today's currency exchanges" + - " rates" + "You are trying to change the account associated with the loan record to an " + + "account of different currency" + + "\n The Loan Record will be re-calculated based on today's currency exchanges" + + " rates" } else { "Note: You are trying to change the account associated with the loan: ${loan.name} " + - "with an account of different currency, " + - "\nAll the loan records will be re-calculated based on today's currency " + - "exchanges rates " + "with an account of different currency, " + + "\nAll the loan records will be re-calculated based on today's currency " + + "exchanges rates " } val loanCaption = @@ -614,7 +614,7 @@ class EditTransactionViewModel @Inject constructor( dueDate = dueDate.value, dateTime = when { loadedTransaction().dateTime == null && - dueDate.value == null -> { + dueDate.value == null -> { timeNowUTC() } @@ -771,4 +771,4 @@ class EditTransactionViewModel @Inject constructor( save(closeScreen) } } -} \ No newline at end of file +} diff --git a/screen-transactions/build.gradle.kts b/screen-transactions/build.gradle.kts index 350948e32f..7e6e6a33e1 100644 --- a/screen-transactions/build.gradle.kts +++ b/screen-transactions/build.gradle.kts @@ -17,4 +17,4 @@ dependencies { implementation(projects.ivyCommonUi) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/screen-transactions/src/main/java/com/ivy/transactions/TransactionsEvent.kt b/screen-transactions/src/main/java/com/ivy/transactions/TransactionsEvent.kt index a3814927b7..d837dab586 100644 --- a/screen-transactions/src/main/java/com/ivy/transactions/TransactionsEvent.kt +++ b/screen-transactions/src/main/java/com/ivy/transactions/TransactionsEvent.kt @@ -45,4 +45,4 @@ sealed interface TransactionsEvent { data class SetSkipAllModalVisible(val visible: Boolean) : TransactionsEvent data class OnDeleteModal1Visible(val delete: Boolean) : TransactionsEvent data class OnChoosePeriodModalData(val data: ChoosePeriodModalData?) : TransactionsEvent -} \ No newline at end of file +} diff --git a/screen-transactions/src/main/java/com/ivy/transactions/TransactionsScreen.kt b/screen-transactions/src/main/java/com/ivy/transactions/TransactionsScreen.kt index 0b4520ab3a..dc2145a7e6 100644 --- a/screen-transactions/src/main/java/com/ivy/transactions/TransactionsScreen.kt +++ b/screen-transactions/src/main/java/com/ivy/transactions/TransactionsScreen.kt @@ -34,11 +34,11 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.ivy.base.legacy.Theme import com.ivy.base.legacy.Transaction import com.ivy.base.legacy.TransactionHistoryItem -import com.ivy.base.legacy.Theme -import com.ivy.base.model.TransactionType import com.ivy.base.legacy.stringRes +import com.ivy.base.model.TransactionType import com.ivy.common.ui.rememberScrollPositionListState import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style @@ -932,4 +932,4 @@ private fun BoxWithConstraintsScope.Preview_empty_upcoming() { choosePeriodModal = null ) } -} \ No newline at end of file +} diff --git a/screen-transactions/src/main/java/com/ivy/transactions/TransactionsState.kt b/screen-transactions/src/main/java/com/ivy/transactions/TransactionsState.kt index ca80b472b5..ac8b5c5e5e 100644 --- a/screen-transactions/src/main/java/com/ivy/transactions/TransactionsState.kt +++ b/screen-transactions/src/main/java/com/ivy/transactions/TransactionsState.kt @@ -39,4 +39,4 @@ data class TransactionsState( val skipAllModalVisible: Boolean, val deleteModal1Visible: Boolean, val choosePeriodModal: ChoosePeriodModalData? -) \ No newline at end of file +) diff --git a/screen-transactions/src/main/java/com/ivy/transactions/TransactionsViewModel.kt b/screen-transactions/src/main/java/com/ivy/transactions/TransactionsViewModel.kt index 2f8078289e..04444494f0 100644 --- a/screen-transactions/src/main/java/com/ivy/transactions/TransactionsViewModel.kt +++ b/screen-transactions/src/main/java/com/ivy/transactions/TransactionsViewModel.kt @@ -9,8 +9,14 @@ import androidx.lifecycle.viewModelScope import arrow.core.toOption import com.ivy.base.legacy.Transaction import com.ivy.base.legacy.TransactionHistoryItem -import com.ivy.base.model.TransactionType import com.ivy.base.legacy.stringRes +import com.ivy.base.model.TransactionType +import com.ivy.data.db.dao.read.AccountDao +import com.ivy.data.db.dao.read.CategoryDao +import com.ivy.data.db.dao.write.WriteAccountDao +import com.ivy.data.db.dao.write.WriteCategoryDao +import com.ivy.data.db.dao.write.WritePlannedPaymentRuleDao +import com.ivy.data.db.dao.write.WriteTransactionDao import com.ivy.domain.ComposeViewModel import com.ivy.frp.then import com.ivy.legacy.IvyWalletCtx @@ -28,12 +34,6 @@ import com.ivy.legacy.utils.isNotNullOrBlank import com.ivy.legacy.utils.selectEndTextFieldValue import com.ivy.navigation.Navigation import com.ivy.navigation.TransactionsScreen -import com.ivy.data.db.dao.read.AccountDao -import com.ivy.data.db.dao.read.CategoryDao -import com.ivy.data.db.dao.write.WriteAccountDao -import com.ivy.data.db.dao.write.WriteCategoryDao -import com.ivy.data.db.dao.write.WritePlannedPaymentRuleDao -import com.ivy.data.db.dao.write.WriteTransactionDao import com.ivy.resources.R import com.ivy.wallet.domain.action.account.AccTrnsAct import com.ivy.wallet.domain.action.account.AccountsAct @@ -367,15 +367,15 @@ class TransactionsViewModel @Inject constructor( expenses.doubleValue = incomeExpensePair.expense.toDouble() history.value = ( - accTrnsAct then { - trnsWithDateDivsAct( - TrnsWithDateDivsAct.Input( - baseCurrency = baseCurrency.value, - transactions = it - ) + accTrnsAct then { + trnsWithDateDivsAct( + TrnsWithDateDivsAct.Input( + baseCurrency = baseCurrency.value, + transactions = it ) - } - )( + ) + } + )( AccTrnsAct.Input( accountId = initialAccount.id, range = range.toCloseTimeRange() @@ -609,10 +609,10 @@ class TransactionsViewModel @Inject constructor( val accountFilterIdSet = accountFilterList.toHashSet() val trans = transactions.filter { it.categoryId == null && ( - accountFilterIdSet.contains(it.accountId) || accountFilterIdSet.contains( - it.toAccountId - ) - ) && it.type == TransactionType.TRANSFER + accountFilterIdSet.contains(it.accountId) || accountFilterIdSet.contains( + it.toAccountId + ) + ) && it.type == TransactionType.TRANSFER } val historyIncomeExpense = calcTrnsIncomeExpenseAct( @@ -788,7 +788,7 @@ class TransactionsViewModel @Inject constructor( private fun updateAccountDeletionState(confirmationText: String) { accountNameConfirmation.value = selectEndTextFieldValue(confirmationText) enableDeletionButton.value = account.value?.name == confirmationText || - category.value?.name == confirmationText + category.value?.name == confirmationText } fun start( @@ -824,7 +824,7 @@ class TransactionsViewModel @Inject constructor( // unspecifiedCategory==false is explicitly checked to accommodate for a temp // AccountTransfers Category during Reports Screen screen.categoryId != null && screen.transactions.isNotEmpty() && - screen.unspecifiedCategory == false -> { + screen.unspecifiedCategory == false -> { initForCategoryWithTransactions( screen.categoryId!!, screen.accountIdFilterList, @@ -848,4 +848,4 @@ class TransactionsViewModel @Inject constructor( } } } -} \ No newline at end of file +} diff --git a/temp-legacy-code/build.gradle.kts b/temp-legacy-code/build.gradle.kts index 8494f10ea8..cfd9fcbdf2 100644 --- a/temp-legacy-code/build.gradle.kts +++ b/temp-legacy-code/build.gradle.kts @@ -23,4 +23,4 @@ dependencies { implementation(libs.datastore) implementation(libs.keval) implementation(libs.androidx.recyclerview) -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/IntervalTypeExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/IntervalTypeExt.kt index 389e4359e7..6bf34cdcb5 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/IntervalTypeExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/IntervalTypeExt.kt @@ -22,4 +22,4 @@ fun IntervalType.incrementDate(date: LocalDateTime, intervalN: Long): LocalDateT IntervalType.MONTH -> date.plusMonths(intervalN) IntervalType.YEAR -> date.plusYears(intervalN) } -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/IvyComposeApp.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/IvyComposeApp.kt index bbe8aa741a..c55cf37a29 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/IvyComposeApp.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/IvyComposeApp.kt @@ -14,13 +14,13 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView import com.ivy.base.legacy.Theme import com.ivy.base.legacy.appContext -import com.ivy.domain.RootScreen import com.ivy.design.IvyContext import com.ivy.design.api.IvyDesign import com.ivy.design.api.ivyContext import com.ivy.design.api.systems.IvyWalletDesign import com.ivy.design.l0_system.UI import com.ivy.design.utils.IvyPreview +import com.ivy.domain.RootScreen import com.ivy.navigation.Navigation import com.ivy.navigation.NavigationRoot @@ -79,4 +79,4 @@ fun IvyWalletPreview( @Deprecated("Old design system. Use `:ivy-design` and Material3") fun appDesign(context: IvyWalletCtx): IvyDesign = object : IvyWalletDesign() { override fun context(): IvyContext = context -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/IvyWalletCtx.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/IvyWalletCtx.kt index 3feb84318c..b01d852fdc 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/IvyWalletCtx.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/IvyWalletCtx.kt @@ -5,10 +5,10 @@ import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.Category import com.ivy.design.IvyContext import com.ivy.legacy.data.SharedPrefs +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.Category import java.time.LocalDate import java.time.LocalTime import java.util.* diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/LoanExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/LoanExt.kt index 48f581e115..2f5659d399 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/LoanExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/LoanExt.kt @@ -1,8 +1,8 @@ package com.ivy.legacy import com.ivy.base.legacy.stringRes -import com.ivy.legacy.datamodel.Loan import com.ivy.data.model.LoanType +import com.ivy.legacy.datamodel.Loan import com.ivy.resources.R fun Loan.humanReadableType(): String { @@ -11,4 +11,4 @@ fun Loan.humanReadableType(): String { } else { stringRes(R.string.lent_uppercase) } -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/LogoutLogic.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/LogoutLogic.kt index dbe354b51f..432241a0ca 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/LogoutLogic.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/LogoutLogic.kt @@ -1,11 +1,11 @@ package com.ivy.legacy +import com.ivy.data.db.IvyRoomDatabase import com.ivy.legacy.data.SharedPrefs import com.ivy.legacy.utils.ioThread import com.ivy.navigation.MainScreen import com.ivy.navigation.Navigation import com.ivy.navigation.OnboardingScreen -import com.ivy.data.db.IvyRoomDatabase import javax.inject.Inject @Deprecated("Migrate to FP Style & Actions") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/data/SharedPrefs.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/data/SharedPrefs.kt index a68eb7b60e..6f2d2bdaff 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/data/SharedPrefs.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/data/SharedPrefs.kt @@ -23,6 +23,7 @@ class SharedPrefs @Inject constructor( const val START_DATE_OF_MONTH = "start_date_of_month" const val SHOW_NOTIFICATIONS = "show_notifications" const val HIDE_CURRENT_BALANCE = "hide_current_balance" + const val HIDE_INCOME = "hide_income" const val TRANSFERS_AS_INCOME_EXPENSE = "transfers_as_inc_exp" // ----------------------------- App Settings ----------------------------------------------- diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/data/model/LastNTimeRange.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/data/model/LastNTimeRange.kt index 04f3a9db30..6c31b09b2f 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/data/model/LastNTimeRange.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/data/model/LastNTimeRange.kt @@ -1,10 +1,10 @@ package com.ivy.legacy.data.model import androidx.compose.runtime.Immutable +import com.ivy.data.model.IntervalType import com.ivy.legacy.forDisplay import com.ivy.legacy.incrementDate import com.ivy.legacy.utils.timeNowUTC -import com.ivy.data.model.IntervalType import java.time.LocalDateTime @Immutable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/PlannedPaymentRule.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/PlannedPaymentRule.kt index 1f4f8cacf8..10bf93c4fc 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/PlannedPaymentRule.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/PlannedPaymentRule.kt @@ -1,9 +1,9 @@ package com.ivy.legacy.datamodel import androidx.compose.runtime.Immutable +import com.ivy.base.model.TransactionType import com.ivy.data.db.entity.PlannedPaymentRuleEntity import com.ivy.data.model.IntervalType -import com.ivy.base.model.TransactionType import java.time.LocalDateTime import java.util.UUID diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/TransactionExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/TransactionExt.kt index 3a6bf2edbb..ba394263ef 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/TransactionExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/TransactionExt.kt @@ -21,4 +21,4 @@ fun Transaction.toEntity(): TransactionEntity = TransactionEntity( id = id, isSynced = isSynced, isDeleted = isDeleted -) \ No newline at end of file +) diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/AccountExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/AccountExt.kt index 216af3208b..5450151869 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/AccountExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/AccountExt.kt @@ -1,7 +1,7 @@ package com.ivy.legacy.datamodel.temp -import com.ivy.legacy.datamodel.Account import com.ivy.data.db.entity.AccountEntity +import com.ivy.legacy.datamodel.Account fun AccountEntity.toDomain(): Account = Account( name = name, @@ -13,4 +13,4 @@ fun AccountEntity.toDomain(): Account = Account( isSynced = isSynced, isDeleted = isDeleted, id = id -) \ No newline at end of file +) diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/BudgetExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/BudgetExt.kt index 15681b3347..cb2fae5453 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/BudgetExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/BudgetExt.kt @@ -1,7 +1,7 @@ package com.ivy.legacy.datamodel.temp -import com.ivy.legacy.datamodel.Budget import com.ivy.data.db.entity.BudgetEntity +import com.ivy.legacy.datamodel.Budget import java.util.UUID fun BudgetEntity.toDomain(): Budget = Budget( @@ -50,4 +50,4 @@ private fun parseIdsString(idsString: String?): List { fun BudgetEntity.validate(): Boolean { return name.isNotEmpty() && amount > 0.0 -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/CategoryExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/CategoryExt.kt index f3960a2ba6..02d4dfc253 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/CategoryExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/CategoryExt.kt @@ -1,7 +1,7 @@ package com.ivy.legacy.datamodel.temp -import com.ivy.legacy.datamodel.Category import com.ivy.data.db.entity.CategoryEntity +import com.ivy.legacy.datamodel.Category fun CategoryEntity.toDomain(): Category = Category( name = name, @@ -11,4 +11,4 @@ fun CategoryEntity.toDomain(): Category = Category( isSynced = isSynced, isDeleted = isDeleted, id = id -) \ No newline at end of file +) diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/ExchangeRateExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/ExchangeRateExt.kt index 0990dc0d27..f013581cb1 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/ExchangeRateExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/ExchangeRateExt.kt @@ -1,10 +1,10 @@ package com.ivy.legacy.datamodel.temp -import com.ivy.legacy.datamodel.ExchangeRate import com.ivy.data.db.entity.ExchangeRateEntity +import com.ivy.legacy.datamodel.ExchangeRate fun ExchangeRateEntity.toDomain(): ExchangeRate = ExchangeRate( baseCurrency = baseCurrency, currency = currency, rate = rate -) \ No newline at end of file +) diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/LoanExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/LoanExt.kt index fe0d10eb7c..2121a69b12 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/LoanExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/LoanExt.kt @@ -1,8 +1,8 @@ package com.ivy.legacy.datamodel.temp -import com.ivy.legacy.datamodel.Loan import com.ivy.data.db.entity.LoanEntity import com.ivy.data.model.LoanType +import com.ivy.legacy.datamodel.Loan fun LoanEntity.toDomain(): Loan = Loan( name = name, @@ -19,4 +19,4 @@ fun LoanEntity.toDomain(): Loan = Loan( fun LoanEntity.humanReadableType(): String { return if (type == LoanType.BORROW) "BORROWED" else "LENT" -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/LoanRecordExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/LoanRecordExt.kt index 2be4d1c47a..3ca740c4a5 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/LoanRecordExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/LoanRecordExt.kt @@ -1,7 +1,7 @@ package com.ivy.legacy.datamodel.temp -import com.ivy.legacy.datamodel.LoanRecord import com.ivy.data.db.entity.LoanRecordEntity +import com.ivy.legacy.datamodel.LoanRecord fun LoanRecordEntity.toDomain(): LoanRecord = LoanRecord( loanId = loanId, @@ -14,4 +14,4 @@ fun LoanRecordEntity.toDomain(): LoanRecord = LoanRecord( isSynced = isSynced, isDeleted = isDeleted, id = id -) \ No newline at end of file +) diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/PlannedPaymentRuleExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/PlannedPaymentRuleExt.kt index 476a588c1c..fa44182c01 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/PlannedPaymentRuleExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/PlannedPaymentRuleExt.kt @@ -1,7 +1,7 @@ package com.ivy.legacy.datamodel.temp -import com.ivy.legacy.datamodel.PlannedPaymentRule import com.ivy.data.db.entity.PlannedPaymentRuleEntity +import com.ivy.legacy.datamodel.PlannedPaymentRule fun PlannedPaymentRuleEntity.toDomain(): PlannedPaymentRule = PlannedPaymentRule( startDate = startDate, @@ -17,4 +17,4 @@ fun PlannedPaymentRuleEntity.toDomain(): PlannedPaymentRule = PlannedPaymentRule isSynced = isSynced, isDeleted = isDeleted, id = id -) \ No newline at end of file +) diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/SettingsExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/SettingsExt.kt index 8a7e5f89c9..4312864780 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/SettingsExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/SettingsExt.kt @@ -1,7 +1,7 @@ package com.ivy.legacy.datamodel.temp -import com.ivy.legacy.datamodel.Settings import com.ivy.data.db.entity.SettingsEntity +import com.ivy.legacy.datamodel.Settings fun SettingsEntity.toDomain(): Settings = Settings( theme = theme, @@ -9,4 +9,4 @@ fun SettingsEntity.toDomain(): Settings = Settings( bufferAmount = bufferAmount.toBigDecimal(), name = name, id = id -) \ No newline at end of file +) diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/TransactionExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/TransactionExt.kt index e869b6e4bd..3f0ca1f41e 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/TransactionExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/datamodel/temp/TransactionExt.kt @@ -32,4 +32,4 @@ fun TransactionEntity.isIdenticalWith(transaction: TransactionEntity?): Boolean isSynced = false, isDeleted = false ) -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccTrnsAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccTrnsAct.kt index 884015e4f8..3f97cf1663 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccTrnsAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccTrnsAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.account import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.frp.action.FPAction import com.ivy.frp.action.thenMap -import com.ivy.data.db.dao.read.TransactionDao +import com.ivy.legacy.datamodel.temp.toDomain import com.ivy.wallet.domain.pure.data.ClosedTimeRange import java.util.UUID import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccountByIdAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccountByIdAct.kt index 77f4b8e50a..00f0f659b0 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccountByIdAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccountByIdAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.account -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.data.db.dao.read.AccountDao import com.ivy.frp.action.FPAction import com.ivy.frp.then -import com.ivy.data.db.dao.read.AccountDao +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.temp.toDomain import java.util.UUID import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccountsAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccountsAct.kt index 00d5974c3c..c68ac6356a 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccountsAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/AccountsAct.kt @@ -1,9 +1,9 @@ package com.ivy.wallet.domain.action.account +import com.ivy.data.db.dao.read.AccountDao +import com.ivy.frp.action.FPAction import com.ivy.legacy.datamodel.Account import com.ivy.legacy.datamodel.temp.toDomain -import com.ivy.frp.action.FPAction -import com.ivy.data.db.dao.read.AccountDao import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/CalcAccBalanceAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/CalcAccBalanceAct.kt index b078ec2c55..6115f60484 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/CalcAccBalanceAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/CalcAccBalanceAct.kt @@ -1,9 +1,9 @@ package com.ivy.wallet.domain.action.account import arrow.core.nonEmptyListOf -import com.ivy.legacy.datamodel.Account import com.ivy.frp.action.FPAction import com.ivy.frp.then +import com.ivy.legacy.datamodel.Account import com.ivy.wallet.domain.pure.data.ClosedTimeRange import com.ivy.wallet.domain.pure.transaction.AccountValueFunctions import com.ivy.wallet.domain.pure.transaction.foldTransactions diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/CalcAccIncomeExpenseAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/CalcAccIncomeExpenseAct.kt index 91174cb9a5..cadafe4def 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/CalcAccIncomeExpenseAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/account/CalcAccIncomeExpenseAct.kt @@ -1,9 +1,9 @@ package com.ivy.wallet.domain.action.account import arrow.core.nonEmptyListOf -import com.ivy.legacy.datamodel.Account import com.ivy.frp.action.FPAction import com.ivy.frp.then +import com.ivy.legacy.datamodel.Account import com.ivy.wallet.domain.pure.data.ClosedTimeRange import com.ivy.wallet.domain.pure.data.IncomeExpensePair import com.ivy.wallet.domain.pure.transaction.AccountValueFunctions diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/budget/BudgetsAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/budget/BudgetsAct.kt index df6314792d..14c5a978fb 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/budget/BudgetsAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/budget/BudgetsAct.kt @@ -1,11 +1,11 @@ package com.ivy.wallet.domain.action.budget -import com.ivy.legacy.datamodel.Budget -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.data.db.dao.read.BudgetDao import com.ivy.frp.action.FPAction import com.ivy.frp.action.thenMap import com.ivy.frp.then -import com.ivy.data.db.dao.read.BudgetDao +import com.ivy.legacy.datamodel.Budget +import com.ivy.legacy.datamodel.temp.toDomain import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoriesAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoriesAct.kt index 41c0e203ef..7d64b7b527 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoriesAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoriesAct.kt @@ -1,11 +1,11 @@ package com.ivy.wallet.domain.action.category -import com.ivy.legacy.datamodel.Category -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.data.db.dao.read.CategoryDao import com.ivy.frp.action.FPAction import com.ivy.frp.action.thenMap import com.ivy.frp.then -import com.ivy.data.db.dao.read.CategoryDao +import com.ivy.legacy.datamodel.Category +import com.ivy.legacy.datamodel.temp.toDomain import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryByIdAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryByIdAct.kt index 2c242dad38..e461c11a64 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryByIdAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryByIdAct.kt @@ -1,9 +1,9 @@ package com.ivy.wallet.domain.action.category +import com.ivy.data.db.dao.read.CategoryDao +import com.ivy.frp.action.FPAction import com.ivy.legacy.datamodel.Category import com.ivy.legacy.datamodel.temp.toDomain -import com.ivy.frp.action.FPAction -import com.ivy.data.db.dao.read.CategoryDao import java.util.UUID import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryIncomeWithAccountFiltersAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryIncomeWithAccountFiltersAct.kt index 2cd762d4dc..5e45648756 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryIncomeWithAccountFiltersAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryIncomeWithAccountFiltersAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.category import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.Category import com.ivy.frp.action.FPAction import com.ivy.frp.then +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.Category import com.ivy.wallet.domain.action.transaction.CalcTrnsIncomeExpenseAct import com.ivy.wallet.domain.pure.data.IncomeExpenseTransferPair import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryTrnsBetweenAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryTrnsBetweenAct.kt index a8c9f0c65f..bde9f2371f 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryTrnsBetweenAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/category/CategoryTrnsBetweenAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.category import com.ivy.base.legacy.Transaction +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.frp.action.FPAction import com.ivy.frp.action.thenMap import com.ivy.legacy.datamodel.temp.toDomain -import com.ivy.data.db.dao.read.TransactionDao import com.ivy.wallet.domain.pure.data.ClosedTimeRange import java.util.UUID import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/exchange/ExchangeAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/exchange/ExchangeAct.kt index a09d603749..4dc9541003 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/exchange/ExchangeAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/exchange/ExchangeAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.exchange import arrow.core.Option -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.data.db.dao.read.ExchangeRatesDao import com.ivy.frp.action.FPAction import com.ivy.frp.then -import com.ivy.data.db.dao.read.ExchangeRatesDao +import com.ivy.legacy.datamodel.temp.toDomain import com.ivy.wallet.domain.pure.exchange.ExchangeData import com.ivy.wallet.domain.pure.exchange.exchange import java.math.BigDecimal diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/exchange/SyncExchangeRatesAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/exchange/SyncExchangeRatesAct.kt index d71093588e..c784ed9505 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/exchange/SyncExchangeRatesAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/exchange/SyncExchangeRatesAct.kt @@ -1,10 +1,10 @@ package com.ivy.legacy.domain.action.exchange import androidx.annotation.Keep -import com.ivy.frp.action.Action import com.ivy.data.db.dao.read.ExchangeRatesDao import com.ivy.data.db.dao.write.WriteExchangeRatesDao import com.ivy.data.db.entity.ExchangeRateEntity +import com.ivy.frp.action.Action import dagger.Lazy import io.ktor.client.HttpClient import io.ktor.client.call.body diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/loan/LoanByIdAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/loan/LoanByIdAct.kt index f58674a757..2a5e956f96 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/loan/LoanByIdAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/loan/LoanByIdAct.kt @@ -1,9 +1,9 @@ package com.ivy.wallet.domain.action.loan +import com.ivy.data.db.dao.read.LoanDao +import com.ivy.frp.action.FPAction import com.ivy.legacy.datamodel.Loan import com.ivy.legacy.datamodel.temp.toDomain -import com.ivy.frp.action.FPAction -import com.ivy.data.db.dao.read.LoanDao import java.util.UUID import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/loan/LoansAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/loan/LoansAct.kt index 3a852d3607..fba3a84007 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/loan/LoansAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/loan/LoansAct.kt @@ -1,11 +1,11 @@ package com.ivy.wallet.domain.action.loan -import com.ivy.legacy.datamodel.Loan -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.data.db.dao.read.LoanDao import com.ivy.frp.action.FPAction import com.ivy.frp.action.thenMap import com.ivy.frp.then -import com.ivy.data.db.dao.read.LoanDao +import com.ivy.legacy.datamodel.Loan +import com.ivy.legacy.datamodel.temp.toDomain import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/BaseCurrencyAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/BaseCurrencyAct.kt index a881b68b25..f227bc3fab 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/BaseCurrencyAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/BaseCurrencyAct.kt @@ -1,7 +1,7 @@ package com.ivy.wallet.domain.action.settings -import com.ivy.frp.action.FPAction import com.ivy.data.db.dao.read.SettingsDao +import com.ivy.frp.action.FPAction import javax.inject.Inject class BaseCurrencyAct @Inject constructor( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/SettingsAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/SettingsAct.kt index edcb95f455..46a548297c 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/SettingsAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/SettingsAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.settings -import com.ivy.legacy.datamodel.Settings -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.data.db.dao.read.SettingsDao import com.ivy.frp.action.FPAction import com.ivy.frp.then -import com.ivy.data.db.dao.read.SettingsDao +import com.ivy.legacy.datamodel.Settings +import com.ivy.legacy.datamodel.temp.toDomain import javax.inject.Inject class SettingsAct @Inject constructor( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/UpdateSettingsAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/UpdateSettingsAct.kt index e8f97bea24..edb8473213 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/UpdateSettingsAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/UpdateSettingsAct.kt @@ -1,8 +1,8 @@ package com.ivy.legacy.domain.action.settings -import com.ivy.legacy.datamodel.Settings -import com.ivy.frp.action.FPAction import com.ivy.data.db.dao.write.WriteSettingsDao +import com.ivy.frp.action.FPAction +import com.ivy.legacy.datamodel.Settings import javax.inject.Inject class UpdateSettingsAct @Inject constructor( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/AllTrnsAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/AllTrnsAct.kt index a5b5acb390..f25c8468be 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/AllTrnsAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/AllTrnsAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.transaction import com.ivy.base.legacy.Transaction +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.frp.action.FPAction import com.ivy.frp.action.thenMap import com.ivy.legacy.datamodel.temp.toDomain -import com.ivy.data.db.dao.read.TransactionDao import javax.inject.Inject class AllTrnsAct @Inject constructor( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/CalcTrnsIncomeExpenseAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/CalcTrnsIncomeExpenseAct.kt index 139a7554f0..2d6083f045 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/CalcTrnsIncomeExpenseAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/CalcTrnsIncomeExpenseAct.kt @@ -2,9 +2,9 @@ package com.ivy.wallet.domain.action.transaction import arrow.core.nonEmptyListOf import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.Account import com.ivy.frp.action.FPAction import com.ivy.frp.then +import com.ivy.legacy.datamodel.Account import com.ivy.wallet.domain.action.exchange.ExchangeAct import com.ivy.wallet.domain.action.exchange.actInput import com.ivy.wallet.domain.pure.data.IncomeExpenseTransferPair diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/DueTrnsAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/DueTrnsAct.kt index b8c40df1b3..dd05fa7251 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/DueTrnsAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/DueTrnsAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.transaction import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.frp.action.FPAction import com.ivy.frp.action.thenMap -import com.ivy.data.db.dao.read.TransactionDao +import com.ivy.legacy.datamodel.temp.toDomain import com.ivy.wallet.domain.pure.data.ClosedTimeRange import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/HistoryTrnsAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/HistoryTrnsAct.kt index c9cb8076e2..080a114d79 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/HistoryTrnsAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/HistoryTrnsAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.transaction import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.frp.action.FPAction import com.ivy.frp.action.thenMap -import com.ivy.data.db.dao.read.TransactionDao +import com.ivy.legacy.datamodel.temp.toDomain import com.ivy.wallet.domain.pure.data.ClosedTimeRange import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnByIdAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnByIdAct.kt index b9ccdb605a..1dd485ebae 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnByIdAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnByIdAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.transaction import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.frp.action.FPAction import com.ivy.frp.then -import com.ivy.data.db.dao.read.TransactionDao +import com.ivy.legacy.datamodel.temp.toDomain import java.util.UUID import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnsWithDateDivsAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnsWithDateDivsAct.kt index 5302063784..4765e5132e 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnsWithDateDivsAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnsWithDateDivsAct.kt @@ -2,10 +2,10 @@ package com.ivy.wallet.domain.action.transaction import com.ivy.base.legacy.Transaction import com.ivy.base.legacy.TransactionHistoryItem +import com.ivy.data.db.dao.read.AccountDao import com.ivy.frp.action.FPAction import com.ivy.frp.then import com.ivy.legacy.datamodel.temp.toDomain -import com.ivy.data.db.dao.read.AccountDao import com.ivy.wallet.domain.action.exchange.ExchangeAct import com.ivy.wallet.domain.action.exchange.actInput import com.ivy.wallet.domain.pure.transaction.transactionsWithDateDividers diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnsWithRangeAndAccFiltersAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnsWithRangeAndAccFiltersAct.kt index 399e4d503a..699089d96b 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnsWithRangeAndAccFiltersAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/transaction/TrnsWithRangeAndAccFiltersAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.transaction import com.ivy.base.legacy.Transaction +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.frp.action.FPAction import com.ivy.frp.action.thenFilter import com.ivy.legacy.datamodel.temp.toDomain -import com.ivy.data.db.dao.read.TransactionDao import java.util.UUID import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/account/AccountDataAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/account/AccountDataAct.kt index 3688a301d9..1b480502b9 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/account/AccountDataAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/account/AccountDataAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.viewmodel.account import arrow.core.toOption -import com.ivy.legacy.datamodel.Account import com.ivy.frp.action.FPAction import com.ivy.frp.action.thenMap import com.ivy.frp.then +import com.ivy.legacy.datamodel.Account import com.ivy.wallet.domain.action.account.CalcAccBalanceAct import com.ivy.wallet.domain.action.account.CalcAccIncomeExpenseAct import com.ivy.wallet.domain.action.exchange.ExchangeAct diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/HasTrnsAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/HasTrnsAct.kt index 1d03b4874a..d0e7153a47 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/HasTrnsAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/HasTrnsAct.kt @@ -1,7 +1,7 @@ package com.ivy.wallet.domain.action.viewmodel.home -import com.ivy.frp.action.FPAction import com.ivy.data.db.dao.read.TransactionDao +import com.ivy.frp.action.FPAction import javax.inject.Inject class HasTrnsAct @Inject constructor( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/ShouldHideIncomeAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/ShouldHideIncomeAct.kt new file mode 100644 index 0000000000..b69b317bc3 --- /dev/null +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/ShouldHideIncomeAct.kt @@ -0,0 +1,16 @@ +package com.ivy.legacy.domain.action.viewmodel.home + +import com.ivy.frp.action.FPAction +import com.ivy.legacy.data.SharedPrefs +import javax.inject.Inject + +class ShouldHideIncomeAct @Inject constructor( + private val sharedPrefs: SharedPrefs +) : FPAction() { + override suspend fun Unit.compose(): suspend () -> Boolean = { + sharedPrefs.getBoolean( + SharedPrefs.HIDE_INCOME, + false + ) + } +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/UpdateAccCacheAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/UpdateAccCacheAct.kt index 49d0410f51..0a3e9ddf30 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/UpdateAccCacheAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/UpdateAccCacheAct.kt @@ -1,8 +1,8 @@ package com.ivy.wallet.domain.action.viewmodel.home -import com.ivy.legacy.datamodel.Account import com.ivy.frp.action.FPAction import com.ivy.legacy.IvyWalletCtx +import com.ivy.legacy.datamodel.Account import javax.inject.Inject class UpdateAccCacheAct @Inject constructor( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/UpdateCategoriesCacheAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/UpdateCategoriesCacheAct.kt index 04bca39ef4..6bff5af527 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/UpdateCategoriesCacheAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/UpdateCategoriesCacheAct.kt @@ -1,8 +1,8 @@ package com.ivy.wallet.domain.action.viewmodel.home -import com.ivy.legacy.datamodel.Category import com.ivy.frp.action.FPAction import com.ivy.legacy.IvyWalletCtx +import com.ivy.legacy.datamodel.Category import javax.inject.Inject class UpdateCategoriesCacheAct @Inject constructor( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/transaction/SaveTrnLocallyAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/transaction/SaveTrnLocallyAct.kt index 569f6f26e2..9923eaecc8 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/transaction/SaveTrnLocallyAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/transaction/SaveTrnLocallyAct.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.action.viewmodel.transaction import com.ivy.base.legacy.Transaction +import com.ivy.data.db.dao.write.WriteTransactionDao import com.ivy.frp.action.FPAction import com.ivy.frp.then import com.ivy.legacy.datamodel.toEntity -import com.ivy.data.db.dao.write.WriteTransactionDao import javax.inject.Inject class SaveTrnLocallyAct @Inject constructor( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/wallet/CalcIncomeExpenseAct.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/wallet/CalcIncomeExpenseAct.kt index 957f835fbd..7ec95121e7 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/wallet/CalcIncomeExpenseAct.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/action/wallet/CalcIncomeExpenseAct.kt @@ -5,9 +5,9 @@ import arrow.core.toOption import com.ivy.frp.action.FPAction import com.ivy.frp.action.thenMap import com.ivy.frp.then +import com.ivy.legacy.datamodel.Account import com.ivy.wallet.domain.action.account.AccTrnsAct import com.ivy.wallet.domain.action.exchange.ExchangeAct -import com.ivy.legacy.datamodel.Account import com.ivy.wallet.domain.pure.account.filterExcluded import com.ivy.wallet.domain.pure.data.ClosedTimeRange import com.ivy.wallet.domain.pure.data.IncomeExpensePair diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/AccountCreator.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/AccountCreator.kt index 70a0d8bf58..0262f39749 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/AccountCreator.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/AccountCreator.kt @@ -1,10 +1,10 @@ package com.ivy.legacy.domain.deprecated.logic import androidx.compose.ui.graphics.toArgb -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.utils.ioThread import com.ivy.data.db.dao.read.AccountDao import com.ivy.data.db.dao.write.WriteAccountDao +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.utils.ioThread import com.ivy.wallet.domain.deprecated.logic.WalletAccountLogic import com.ivy.wallet.domain.deprecated.logic.model.CreateAccountData import com.ivy.wallet.domain.pure.util.nextOrderNum @@ -23,7 +23,6 @@ class AccountCreator @Inject constructor( val name = data.name if (name.isBlank()) return - ioThread { val account = Account( name = name, diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/BudgetCreator.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/BudgetCreator.kt index 3803d9e48e..6dc6b65388 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/BudgetCreator.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/BudgetCreator.kt @@ -1,9 +1,9 @@ package com.ivy.legacy.domain.deprecated.logic -import com.ivy.legacy.datamodel.Budget -import com.ivy.legacy.utils.ioThread import com.ivy.data.db.dao.read.BudgetDao import com.ivy.data.db.dao.write.WriteBudgetDao +import com.ivy.legacy.datamodel.Budget +import com.ivy.legacy.utils.ioThread import com.ivy.wallet.domain.deprecated.logic.model.CreateBudgetData import com.ivy.wallet.domain.pure.util.nextOrderNum import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/CategoryCreator.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/CategoryCreator.kt index 03ae72d5ca..243b1cd3c0 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/CategoryCreator.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/CategoryCreator.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.deprecated.logic import androidx.compose.ui.graphics.toArgb -import com.ivy.legacy.datamodel.Category -import com.ivy.legacy.utils.ioThread import com.ivy.data.db.dao.read.CategoryDao import com.ivy.data.db.dao.write.WriteCategoryDao +import com.ivy.legacy.datamodel.Category +import com.ivy.legacy.utils.ioThread import com.ivy.wallet.domain.deprecated.logic.model.CreateCategoryData import com.ivy.wallet.domain.pure.util.nextOrderNum import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/LoanCreator.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/LoanCreator.kt index d1b98701db..63612f9237 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/LoanCreator.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/LoanCreator.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.deprecated.logic import androidx.compose.ui.graphics.toArgb -import com.ivy.legacy.datamodel.Loan -import com.ivy.legacy.utils.ioThread import com.ivy.data.db.dao.read.LoanDao import com.ivy.data.db.dao.write.WriteLoanDao +import com.ivy.legacy.datamodel.Loan +import com.ivy.legacy.utils.ioThread import com.ivy.wallet.domain.deprecated.logic.model.CreateLoanData import com.ivy.wallet.domain.pure.util.nextOrderNum import java.util.UUID diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/LoanRecordCreator.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/LoanRecordCreator.kt index 25376daae7..8221a97952 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/LoanRecordCreator.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/LoanRecordCreator.kt @@ -1,8 +1,8 @@ package com.ivy.wallet.domain.deprecated.logic +import com.ivy.data.db.dao.write.WriteLoanRecordDao import com.ivy.legacy.datamodel.LoanRecord import com.ivy.legacy.utils.ioThread -import com.ivy.data.db.dao.write.WriteLoanRecordDao import com.ivy.wallet.domain.deprecated.logic.model.CreateLoanRecordData import java.util.UUID import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PlannedPaymentsGenerator.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PlannedPaymentsGenerator.kt index bd4824f13b..103f6c0298 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PlannedPaymentsGenerator.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PlannedPaymentsGenerator.kt @@ -1,11 +1,11 @@ package com.ivy.wallet.domain.deprecated.logic import com.ivy.base.legacy.Transaction +import com.ivy.data.db.dao.read.TransactionDao +import com.ivy.data.db.dao.write.WriteTransactionDao import com.ivy.legacy.datamodel.PlannedPaymentRule import com.ivy.legacy.datamodel.toEntity import com.ivy.legacy.incrementDate -import com.ivy.data.db.dao.read.TransactionDao -import com.ivy.data.db.dao.write.WriteTransactionDao import java.time.LocalDateTime import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PlannedPaymentsLogic.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PlannedPaymentsLogic.kt index 6505735da0..8971f8fc7d 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PlannedPaymentsLogic.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PlannedPaymentsLogic.kt @@ -1,12 +1,7 @@ package com.ivy.wallet.domain.deprecated.logic import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.PlannedPaymentRule -import com.ivy.legacy.datamodel.temp.toDomain -import com.ivy.legacy.datamodel.toEntity -import com.ivy.legacy.utils.ioThread -import com.ivy.legacy.utils.timeNowUTC +import com.ivy.base.model.TransactionType import com.ivy.data.db.dao.read.AccountDao import com.ivy.data.db.dao.read.PlannedPaymentRuleDao import com.ivy.data.db.dao.read.SettingsDao @@ -14,7 +9,12 @@ import com.ivy.data.db.dao.read.TransactionDao import com.ivy.data.db.dao.write.WritePlannedPaymentRuleDao import com.ivy.data.db.dao.write.WriteTransactionDao import com.ivy.data.model.IntervalType -import com.ivy.base.model.TransactionType +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.PlannedPaymentRule +import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.legacy.datamodel.toEntity +import com.ivy.legacy.utils.ioThread +import com.ivy.legacy.utils.timeNowUTC import com.ivy.wallet.domain.deprecated.logic.currency.ExchangeRatesLogic import com.ivy.wallet.domain.deprecated.logic.currency.sumByDoublePlannedInBaseCurrency import javax.inject.Inject @@ -129,13 +129,13 @@ class PlannedPaymentsLogic @Inject constructor( return when (plannedPayment.intervalType) { IntervalType.DAY -> { - val monthDiff = 1 / AVG_DAYS_IN_MONTH //0.03% + val monthDiff = 1 / AVG_DAYS_IN_MONTH // 0.03% (amountBaseCurrency / monthDiff) / intervalN } IntervalType.WEEK -> { - val monthDiff = 7 / AVG_DAYS_IN_MONTH //0.22% + val monthDiff = 7 / AVG_DAYS_IN_MONTH // 0.22% (amountBaseCurrency / monthDiff) / intervalN } @@ -179,9 +179,8 @@ class PlannedPaymentsLogic @Inject constructor( transactionWriter.save(paidTransaction.toEntity()) } - if (plannedPaymentRule != null && plannedPaymentRule.oneTime) { - //delete paid oneTime planned payment rules + // delete paid oneTime planned payment rules plannedPaymentRuleWriter.flagDeleted(plannedPaymentRule.id) } } @@ -229,7 +228,7 @@ class PlannedPaymentsLogic @Inject constructor( plannedPaymentRules.forEach { plannedPaymentRule -> if (plannedPaymentRule != null && plannedPaymentRule.oneTime) { - //delete paid oneTime planned payment rules + // delete paid oneTime planned payment rules plannedPaymentRuleWriter.flagDeleted(plannedPaymentRule.id) } } diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PreloadDataLogic.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PreloadDataLogic.kt index 29d6fa6621..bae6e32089 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PreloadDataLogic.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/PreloadDataLogic.kt @@ -2,11 +2,11 @@ package com.ivy.wallet.domain.deprecated.logic import androidx.compose.ui.graphics.toArgb import com.ivy.base.legacy.stringRes -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.Category -import com.ivy.design.l0_system.* import com.ivy.data.db.dao.write.WriteAccountDao import com.ivy.data.db.dao.write.WriteCategoryDao +import com.ivy.design.l0_system.* +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.Category import com.ivy.resources.R import com.ivy.wallet.domain.deprecated.logic.model.CreateAccountData import com.ivy.wallet.domain.deprecated.logic.model.CreateCategoryData diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/SmartTitleSuggestionsLogic.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/SmartTitleSuggestionsLogic.kt index af8bdfc2a6..1b96f21023 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/SmartTitleSuggestionsLogic.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/SmartTitleSuggestionsLogic.kt @@ -1,10 +1,10 @@ package com.ivy.wallet.domain.deprecated.logic import com.ivy.base.legacy.Transaction +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.legacy.datamodel.temp.toDomain import com.ivy.legacy.utils.capitalizeWords import com.ivy.legacy.utils.isNotNullOrBlank -import com.ivy.data.db.dao.read.TransactionDao import java.util.* import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/WalletAccountLogic.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/WalletAccountLogic.kt index 0ddfcb4575..fa0670ae34 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/WalletAccountLogic.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/WalletAccountLogic.kt @@ -1,15 +1,15 @@ package com.ivy.wallet.domain.deprecated.logic import com.ivy.base.legacy.Transaction +import com.ivy.base.model.TransactionType +import com.ivy.data.db.dao.read.TransactionDao +import com.ivy.data.db.dao.write.WriteTransactionDao import com.ivy.legacy.data.model.filterOverdue import com.ivy.legacy.data.model.filterUpcoming import com.ivy.legacy.datamodel.Account import com.ivy.legacy.datamodel.temp.toDomain import com.ivy.legacy.datamodel.toEntity import com.ivy.legacy.utils.timeNowUTC -import com.ivy.data.db.dao.read.TransactionDao -import com.ivy.data.db.dao.write.WriteTransactionDao -import com.ivy.base.model.TransactionType import java.time.LocalDateTime import javax.inject.Inject import kotlin.math.abs @@ -131,7 +131,7 @@ class WalletAccountLogic @Inject constructor( ): List { return this.filter { it.dateTime != null && - (before == null || it.dateTime!!.isBefore(before)) + (before == null || it.dateTime!!.isBefore(before)) } } diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/WalletCategoryLogic.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/WalletCategoryLogic.kt index a8050c73fe..e6ee708378 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/WalletCategoryLogic.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/WalletCategoryLogic.kt @@ -2,14 +2,14 @@ package com.ivy.wallet.domain.deprecated.logic import com.ivy.base.legacy.Transaction import com.ivy.base.legacy.TransactionHistoryItem +import com.ivy.base.model.TransactionType +import com.ivy.data.db.dao.read.AccountDao +import com.ivy.data.db.dao.read.SettingsDao +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.legacy.data.model.filterOverdue import com.ivy.legacy.data.model.filterUpcoming import com.ivy.legacy.datamodel.Category import com.ivy.legacy.datamodel.temp.toDomain -import com.ivy.data.db.dao.read.AccountDao -import com.ivy.data.db.dao.read.SettingsDao -import com.ivy.data.db.dao.read.TransactionDao -import com.ivy.base.model.TransactionType import com.ivy.wallet.domain.deprecated.logic.currency.ExchangeRatesLogic import com.ivy.wallet.domain.deprecated.logic.currency.sumInBaseCurrency import com.ivy.wallet.domain.pure.transaction.withDateDividers diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/CSVImporter.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/CSVImporter.kt index 274128e6c8..4207ab45bf 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/CSVImporter.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/CSVImporter.kt @@ -2,23 +2,23 @@ package com.ivy.legacy.domain.deprecated.logic.csv import androidx.compose.ui.graphics.toArgb import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.Category -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.base.model.TransactionType +import com.ivy.data.db.dao.read.AccountDao +import com.ivy.data.db.dao.read.CategoryDao +import com.ivy.data.db.dao.read.SettingsDao +import com.ivy.data.db.dao.write.WriteAccountDao +import com.ivy.data.db.dao.write.WriteCategoryDao +import com.ivy.data.db.dao.write.WriteTransactionDao import com.ivy.design.IVY_COLOR_PICKER_COLORS_FREE import com.ivy.design.l0_system.Green import com.ivy.design.l0_system.IvyDark +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.Category +import com.ivy.legacy.datamodel.temp.toDomain import com.ivy.legacy.datamodel.toEntity import com.ivy.legacy.utils.convertLocalToUTC import com.ivy.legacy.utils.timeNowUTC import com.ivy.legacy.utils.toLowerCaseLocal -import com.ivy.data.db.dao.read.AccountDao -import com.ivy.data.db.dao.read.CategoryDao -import com.ivy.data.db.dao.read.SettingsDao -import com.ivy.data.db.dao.write.WriteAccountDao -import com.ivy.data.db.dao.write.WriteCategoryDao -import com.ivy.data.db.dao.write.WriteTransactionDao -import com.ivy.base.model.TransactionType import com.ivy.wallet.domain.data.IvyCurrency import com.ivy.wallet.domain.deprecated.logic.csv.model.CSVRow import com.ivy.wallet.domain.deprecated.logic.csv.model.ImportResult diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/CSVMapper.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/CSVMapper.kt index 104484d651..053aa736db 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/CSVMapper.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/CSVMapper.kt @@ -1,9 +1,9 @@ package com.ivy.wallet.domain.deprecated.logic.csv import com.ivy.base.legacy.Transaction +import com.ivy.base.model.TransactionType import com.ivy.legacy.domain.deprecated.logic.csv.model.ImportType import com.ivy.legacy.utils.toLowerCaseLocal -import com.ivy.base.model.TransactionType import com.ivy.wallet.domain.deprecated.logic.csv.model.JoinResult import com.ivy.wallet.domain.deprecated.logic.csv.model.RowMapping import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/ExportCSVLogic.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/ExportCSVLogic.kt index 8912de95a1..847ad3f646 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/ExportCSVLogic.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/csv/ExportCSVLogic.kt @@ -3,6 +3,11 @@ package com.ivy.wallet.domain.deprecated.logic.csv import android.content.Context import android.net.Uri import com.ivy.base.legacy.Transaction +import com.ivy.base.model.TransactionType +import com.ivy.data.db.dao.read.AccountDao +import com.ivy.data.db.dao.read.CategoryDao +import com.ivy.data.db.dao.read.SettingsDao +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.legacy.datamodel.Account import com.ivy.legacy.datamodel.Category import com.ivy.legacy.datamodel.temp.toDomain @@ -11,11 +16,6 @@ import com.ivy.legacy.utils.formatLocal import com.ivy.legacy.utils.ioThread import com.ivy.legacy.utils.localDecimalSeparator import com.ivy.legacy.utils.writeToFile -import com.ivy.data.db.dao.read.AccountDao -import com.ivy.data.db.dao.read.CategoryDao -import com.ivy.data.db.dao.read.SettingsDao -import com.ivy.data.db.dao.read.TransactionDao -import com.ivy.base.model.TransactionType import org.apache.commons.text.StringEscapeUtils import java.util.UUID import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/currency/ExchangeRatesLogic.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/currency/ExchangeRatesLogic.kt index 4dc2217146..20621a00d1 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/currency/ExchangeRatesLogic.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/currency/ExchangeRatesLogic.kt @@ -1,12 +1,12 @@ package com.ivy.wallet.domain.deprecated.logic.currency import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.PlannedPaymentRule -import com.ivy.legacy.datamodel.temp.toDomain import com.ivy.data.db.dao.read.AccountDao import com.ivy.data.db.dao.read.ExchangeRatesDao import com.ivy.data.db.dao.read.SettingsDao +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.PlannedPaymentRule +import com.ivy.legacy.datamodel.temp.toDomain import java.util.UUID import javax.inject.Inject diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LTLoanMapper.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LTLoanMapper.kt index b2a19689a0..4356f9ed0f 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LTLoanMapper.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LTLoanMapper.kt @@ -1,6 +1,8 @@ package com.ivy.wallet.domain.deprecated.logic.loantrasactions import com.ivy.base.legacy.Transaction +import com.ivy.base.model.TransactionType +import com.ivy.data.model.LoanType import com.ivy.legacy.datamodel.Account import com.ivy.legacy.datamodel.Loan import com.ivy.legacy.datamodel.LoanRecord @@ -8,8 +10,6 @@ import com.ivy.legacy.datamodel.temp.toDomain import com.ivy.legacy.domain.deprecated.logic.loantrasactions.LoanTransactionsCore import com.ivy.legacy.utils.computationThread import com.ivy.legacy.utils.scopedIOThread -import com.ivy.data.model.LoanType -import com.ivy.base.model.TransactionType import com.ivy.wallet.domain.deprecated.logic.model.CreateLoanData import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LoanTransactionsCore.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LoanTransactionsCore.kt index 8c7f54541a..e422d49141 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LoanTransactionsCore.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LoanTransactionsCore.kt @@ -3,17 +3,7 @@ package com.ivy.legacy.domain.deprecated.logic.loantrasactions import androidx.compose.ui.graphics.toArgb import com.ivy.base.legacy.Transaction import com.ivy.base.legacy.stringRes -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.Category -import com.ivy.legacy.datamodel.Loan -import com.ivy.legacy.datamodel.LoanRecord -import com.ivy.legacy.datamodel.temp.toDomain -import com.ivy.design.IVY_COLOR_PICKER_COLORS_FREE -import com.ivy.legacy.IvyWalletCtx -import com.ivy.legacy.datamodel.toEntity -import com.ivy.legacy.utils.computationThread -import com.ivy.legacy.utils.ioThread -import com.ivy.legacy.utils.timeNowUTC +import com.ivy.base.model.TransactionType import com.ivy.data.db.dao.read.AccountDao import com.ivy.data.db.dao.read.CategoryDao import com.ivy.data.db.dao.read.LoanDao @@ -25,7 +15,17 @@ import com.ivy.data.db.dao.write.WriteLoanDao import com.ivy.data.db.dao.write.WriteLoanRecordDao import com.ivy.data.db.dao.write.WriteTransactionDao import com.ivy.data.model.LoanType -import com.ivy.base.model.TransactionType +import com.ivy.design.IVY_COLOR_PICKER_COLORS_FREE +import com.ivy.legacy.IvyWalletCtx +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.Category +import com.ivy.legacy.datamodel.Loan +import com.ivy.legacy.datamodel.LoanRecord +import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.legacy.datamodel.toEntity +import com.ivy.legacy.utils.computationThread +import com.ivy.legacy.utils.ioThread +import com.ivy.legacy.utils.timeNowUTC import com.ivy.resources.R import com.ivy.wallet.domain.deprecated.logic.currency.ExchangeRatesLogic import kotlinx.coroutines.CoroutineScope @@ -261,7 +261,7 @@ class LoanTransactionsCore @Inject constructor( } reCalculateLoanAmount || loanRecordCurrenciesChanged || - oldLonRecordConvertedAmount == null -> { + oldLonRecordConvertedAmount == null -> { ioThread { exchangeRatesLogic.convertAmount( baseCurrency = baseCurrency(), diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/model/CreateLoanData.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/model/CreateLoanData.kt index 7245e3cec5..382847e72b 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/model/CreateLoanData.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/model/CreateLoanData.kt @@ -1,8 +1,8 @@ package com.ivy.wallet.domain.deprecated.logic.model import androidx.compose.ui.graphics.Color -import com.ivy.legacy.datamodel.Account import com.ivy.data.model.LoanType +import com.ivy.legacy.datamodel.Account data class CreateLoanData( val name: String, diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/zip/BackupLogic.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/zip/BackupLogic.kt index f637385d7d..49d19dbc2e 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/zip/BackupLogic.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/deprecated/logic/zip/BackupLogic.kt @@ -3,10 +3,6 @@ package com.ivy.legacy.domain.deprecated.logic.zip import android.content.Context import android.net.Uri import androidx.core.net.toUri -import com.ivy.legacy.data.SharedPrefs -import com.ivy.legacy.utils.ioThread -import com.ivy.legacy.utils.readFile -import com.ivy.legacy.utils.scopedIOThread import com.ivy.data.db.dao.read.AccountDao import com.ivy.data.db.dao.read.BudgetDao import com.ivy.data.db.dao.read.CategoryDao @@ -23,6 +19,10 @@ import com.ivy.data.db.dao.write.WriteLoanRecordDao import com.ivy.data.db.dao.write.WritePlannedPaymentRuleDao import com.ivy.data.db.dao.write.WriteSettingsDao import com.ivy.data.db.dao.write.WriteTransactionDao +import com.ivy.legacy.data.SharedPrefs +import com.ivy.legacy.utils.ioThread +import com.ivy.legacy.utils.readFile +import com.ivy.legacy.utils.scopedIOThread import com.ivy.wallet.domain.data.IvyWalletCompleteData import com.ivy.wallet.domain.deprecated.logic.csv.model.ImportResult import com.ivy.wallet.domain.deprecated.logic.zip.unzip @@ -267,9 +267,9 @@ class BackupLogic @Inject constructor( sharedPrefs.putBoolean( SharedPrefs.TRANSFERS_AS_INCOME_EXPENSE, ( - completeData.sharedPrefs[SharedPrefs.TRANSFERS_AS_INCOME_EXPENSE] - ?: "false" - ).toBoolean() + completeData.sharedPrefs[SharedPrefs.TRANSFERS_AS_INCOME_EXPENSE] + ?: "false" + ).toBoolean() ) plannedPayments.await() diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/CatValueFunctions.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/CatValueFunctions.kt index fb03e412a6..7d3246b58d 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/CatValueFunctions.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/CatValueFunctions.kt @@ -3,9 +3,9 @@ package com.ivy.wallet.domain.pure.transaction import arrow.core.Option import arrow.core.toOption import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.Account -import com.ivy.frp.SideEffect import com.ivy.base.model.TransactionType +import com.ivy.frp.SideEffect +import com.ivy.legacy.datamodel.Account import java.math.BigDecimal import java.util.UUID diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/TrnDateDividers.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/TrnDateDividers.kt index 45d6734e0c..df2b5558e3 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/TrnDateDividers.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/TrnDateDividers.kt @@ -4,15 +4,15 @@ import arrow.core.Option import arrow.core.toOption import com.ivy.base.legacy.Transaction import com.ivy.base.legacy.TransactionHistoryItem -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.temp.toDomain +import com.ivy.data.db.dao.read.AccountDao +import com.ivy.data.db.dao.read.SettingsDao import com.ivy.frp.Pure import com.ivy.frp.SideEffect import com.ivy.frp.then +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.temp.toDomain import com.ivy.legacy.utils.convertUTCtoLocal import com.ivy.legacy.utils.toEpochSeconds -import com.ivy.data.db.dao.read.AccountDao -import com.ivy.data.db.dao.read.SettingsDao import com.ivy.wallet.domain.data.TransactionHistoryDateDivider import com.ivy.wallet.domain.deprecated.logic.currency.ExchangeRatesLogic import com.ivy.wallet.domain.pure.exchange.ExchangeData diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/TrnFunctions.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/TrnFunctions.kt index 8c53184ca7..c76af5c479 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/TrnFunctions.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/TrnFunctions.kt @@ -3,9 +3,9 @@ package com.ivy.wallet.domain.pure.transaction import arrow.core.Option import arrow.core.toOption import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.Account -import com.ivy.frp.Pure import com.ivy.base.model.TransactionType +import com.ivy.frp.Pure +import com.ivy.legacy.datamodel.Account import com.ivy.wallet.domain.pure.account.accountCurrency import java.time.LocalDate diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/WalletValueFunctions.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/WalletValueFunctions.kt index dfed7cc036..700b20a032 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/WalletValueFunctions.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/domain/pure/transaction/WalletValueFunctions.kt @@ -1,9 +1,9 @@ package com.ivy.wallet.domain.pure.transaction import com.ivy.base.legacy.Transaction -import com.ivy.legacy.datamodel.Account -import com.ivy.frp.SideEffect import com.ivy.base.model.TransactionType +import com.ivy.frp.SideEffect +import com.ivy.legacy.datamodel.Account import com.ivy.wallet.domain.pure.exchange.ExchangeEffect import com.ivy.wallet.domain.pure.exchange.exchangeInBaseCurrency import java.math.BigDecimal diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Annotations.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Annotations.kt index 166932ac69..7506de2b0e 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Annotations.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Annotations.kt @@ -15,7 +15,6 @@ annotation class Total(val sideEffect: String = "") @MustBeDocumented annotation class Partial(val inCaseOf: String = "") - @Target(AnnotationTarget.VALUE_PARAMETER) @Retention(AnnotationRetention.SOURCE) @MustBeDocumented diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Composition.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Composition.kt index 452a2240c9..6a91323945 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Composition.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Composition.kt @@ -2,35 +2,35 @@ package com.ivy.frp import com.ivy.frp.action.Action -//Cases: -//A -//() -> B -//(A) -> B -//suspend () -> B -//suspend (A) -> B -//Action - -//Eligible 2nd position -//(A) -> B -//suspend (A) -> B -//Action - -//~ 18 possible combinations -//Note: Non-suspend variants are skipped because or ambiguity errors +// Cases: +// A +// () -> B +// (A) -> B +// suspend () -> B +// suspend (A) -> B +// Action + +// Eligible 2nd position +// (A) -> B +// suspend (A) -> B +// Action + +// ~ 18 possible combinations +// Note: Non-suspend variants are skipped because or ambiguity errors // -------------------------- A ------------------------------------ -//A => (A) -> B -//inline infix fun A.asParamTo(crossinline f: (A) -> B): () -> B = { +// A => (A) -> B +// inline infix fun A.asParamTo(crossinline f: (A) -> B): () -> B = { // f(this) -//} +// } -//A => suspend (A) -> B +// A => suspend (A) -> B @Deprecated("Legacy code. Don't use it, please.") inline infix fun A.asParamTo(crossinline f: suspend (A) -> B): suspend () -> B = { f(this) } -//A => Action +// A => Action @Deprecated("Legacy code. Don't use it, please.") infix fun A.asParamTo(act: Action): suspend () -> B = { act(this) @@ -38,21 +38,21 @@ infix fun A.asParamTo(act: Action): suspend () -> B = { // -------------------------- A ------------------------------------ // -------------------------- () -> B ------------------------------------ -////() -> B => (B) -> C -//inline infix fun (() -> B).then(crossinline f: (B) -> C): () -> C = { +// //() -> B => (B) -> C +// inline infix fun (() -> B).then(crossinline f: (B) -> C): () -> C = { // val b = this() // f(b) -//} -//Error: Ambiguity +// } +// Error: Ambiguity -//() -> B => suspend (B) -> C +// () -> B => suspend (B) -> C @Deprecated("Legacy code. Don't use it, please.") inline infix fun (() -> B).then(crossinline f: suspend (B) -> C): suspend () -> C = { val b = this() f(b) } -//() -> B => Action +// () -> B => Action @Deprecated("Legacy code. Don't use it, please.") infix fun (() -> B).then(act: Action): suspend () -> C = { val b = this() @@ -61,14 +61,14 @@ infix fun (() -> B).then(act: Action): suspend () -> C = { // -------------------------- () -> B ------------------------------------ // -------------------------- (A) -> C ------------------------------------ -//(A) -> B => (B) -> C -//inline infix fun ((A) -> B).then(crossinline f: (B) -> C): (A) -> C = { a -> +// (A) -> B => (B) -> C +// inline infix fun ((A) -> B).then(crossinline f: (B) -> C): (A) -> C = { a -> // val b = this(a) // f(b) -//} -//ERROR: Ambiguity +// } +// ERROR: Ambiguity -//(A) -> B => suspend (B) -> C +// (A) -> B => suspend (B) -> C @Deprecated("Legacy code. Don't use it, please.") inline infix fun ((A) -> B).then(crossinline f: suspend (B) -> C): suspend (A) -> C = { a -> @@ -76,30 +76,30 @@ inline infix fun ((A) -> B).then(crossinline f: suspend (B) -> C): sus f(b) } -//(A) -> B => Action -//infix fun ((A) -> B).then(act: Action): suspend (A) -> C = { a -> +// (A) -> B => Action +// infix fun ((A) -> B).then(act: Action): suspend (A) -> C = { a -> // val b = this(a) // act(b) -//} -//ERROR: Ambiguity +// } +// ERROR: Ambiguity // -------------------------- (A) -> C ------------------------------------ // -------------------------- suspend () -> B ------------------------------------ -//suspend () -> B => (B) -> C -//infix fun (suspend () -> B).then(f: (B) -> C): suspend () -> C = { +// suspend () -> B => (B) -> C +// infix fun (suspend () -> B).then(f: (B) -> C): suspend () -> C = { // val b = this() // f(b) -//} -//Same as: infix fun ((A) -> B).then(f: (B) -> C): (A) -> C +// } +// Same as: infix fun ((A) -> B).then(f: (B) -> C): (A) -> C -//suspend () -> B => suspend (B) -> C +// suspend () -> B => suspend (B) -> C @Deprecated("Legacy code. Don't use it, please.") inline infix fun (suspend () -> B).then(crossinline f: suspend (B) -> C): suspend () -> C = { val b = this() f(b) } -//suspend () -> B => Action +// suspend () -> B => Action @Deprecated("Legacy code. Don't use it, please.") infix fun (suspend () -> B).then(act: Action): suspend () -> C = { val b = this() @@ -108,15 +108,15 @@ infix fun (suspend () -> B).then(act: Action): suspend () -> C = { // -------------------------- suspend () -> B ------------------------------------ // -------------------------- suspend (A) -> B ------------------------------------ -//suspend (A) -> B => (B) -> C -//inline infix fun (suspend (A) -> B).then(crossinline f: (B) -> C): suspend (A) -> C = +// suspend (A) -> B => (B) -> C +// inline infix fun (suspend (A) -> B).then(crossinline f: (B) -> C): suspend (A) -> C = // { a -> // val b = this(a) // f(b) // } // ERROR: Ambiguity -//suspend (A) -> B => suspend (B) -> C +// suspend (A) -> B => suspend (B) -> C @Deprecated("Legacy code. Don't use it, please.") inline infix fun (suspend (A) -> B).then( crossinline f: suspend (B) -> C @@ -126,7 +126,7 @@ inline infix fun (suspend (A) -> B).then( f(b) } -//(A) -> B => Action +// (A) -> B => Action @Deprecated("Legacy code. Don't use it, please.") infix fun (suspend (A) -> B).then(act: Action): suspend (A) -> C = { a -> val b = this(a) @@ -135,14 +135,14 @@ infix fun (suspend (A) -> B).then(act: Action): suspend (A) -> C // -------------------------- suspend (A) -> B ------------------------------------ // -------------------------- Action ------------------------------------ -//Action => (B) -> C -//inline infix fun (Action).then(crossinline f: (B) -> C): suspend (A) -> C = { a -> +// Action => (B) -> C +// inline infix fun (Action).then(crossinline f: (B) -> C): suspend (A) -> C = { a -> // val b = this(a) // f(b) -//} -//ERROR: Ambiguity +// } +// ERROR: Ambiguity -//Action => suspend (B) -> C +// Action => suspend (B) -> C @Deprecated("Legacy code. Don't use it, please.") inline infix fun (Action).then(crossinline f: suspend (B) -> C): suspend (A) -> C = { a -> @@ -150,7 +150,7 @@ inline infix fun (Action).then(crossinline f: suspend (B) -> C): f(b) } -//Action => Action +// Action => Action @Deprecated("Legacy code. Don't use it, please.") infix fun (Action).then(act: Action): suspend (A) -> C = { a -> val b = this(a) @@ -158,62 +158,62 @@ infix fun (Action).then(act: Action): suspend (A) -> C = { } // -------------------------- Action ------------------------------------ -//================================= thenInvokeAfter ========================================== -//First part: -//() -> B -//(A) -> B -//suspend () -> B -//suspend (A) -> B -//Action - -//Second part: -//(A) -> B -//suspend (A) -> B -//Action - -//--------------------------- () -> B ----------------------------- -//() -> B => (B) -> C -//inline infix fun (() -> B).thenInvokeAfter(crossinline f: (B) -> C): C { +// ================================= thenInvokeAfter ========================================== +// First part: +// () -> B +// (A) -> B +// suspend () -> B +// suspend (A) -> B +// Action + +// Second part: +// (A) -> B +// suspend (A) -> B +// Action + +// --------------------------- () -> B ----------------------------- +// () -> B => (B) -> C +// inline infix fun (() -> B).thenInvokeAfter(crossinline f: (B) -> C): C { // val b = this@thenInvokeAfter() // return f(b) -//} -//ERROR: Ambiguity +// } +// ERROR: Ambiguity -//() -> B => suspend (B) -> C +// () -> B => suspend (B) -> C @Deprecated("Legacy code. Don't use it, please.") suspend inline infix fun (() -> B).thenInvokeAfter(crossinline f: suspend (B) -> C): C { val b = this@thenInvokeAfter() return f(b) } -//() -> B => Action +// () -> B => Action @Deprecated("Legacy code. Don't use it, please.") suspend infix fun (() -> B).thenInvokeAfter(act: Action): C { val b = this@thenInvokeAfter() return act(b) } -//--------------------------- () -> B ----------------------------- +// --------------------------- () -> B ----------------------------- -//--------------------------- (A) -> B ----------------------------- -//(A) -> B => (B) -> C -//infix fun ((A) -> B).thenInvokeAfter(f: (B) -> C): C { "a ->" -- cannot have this +// --------------------------- (A) -> B ----------------------------- +// (A) -> B => (B) -> C +// infix fun ((A) -> B).thenInvokeAfter(f: (B) -> C): C { "a ->" -- cannot have this // val b = this@thenInvokeAfter() // return f(b) -//} -//INVALID BECAUSE "A" parameter will turn the function into lambda +// } +// INVALID BECAUSE "A" parameter will turn the function into lambda -//(A) -> B => suspend (B) -> C -//(A) -> B => Action -//--------------------------- (A) -> B ----------------------------- +// (A) -> B => suspend (B) -> C +// (A) -> B => Action +// --------------------------- (A) -> B ----------------------------- -//--------------------------- suspend () -> B ----------------------------- -//suspend () -> B => (B) -> C -//suspend infix fun (suspend () -> B).thenInvokeAfter(f: (B) -> C): C { +// --------------------------- suspend () -> B ----------------------------- +// suspend () -> B => (B) -> C +// suspend infix fun (suspend () -> B).thenInvokeAfter(f: (B) -> C): C { // val b = this@thenInvokeAfter() // return f(b) -//} +// } -//() -> B => suspend (B) -> C +// () -> B => suspend (B) -> C @Deprecated("Legacy code. Don't use it, please.") suspend inline infix fun (suspend () -> B).thenInvokeAfter( crossinline f: suspend (B) -> C @@ -222,26 +222,26 @@ suspend inline infix fun (suspend () -> B).thenInvokeAfter( return f(b) } -//suspend () -> B => Action +// suspend () -> B => Action @Deprecated("Legacy code. Don't use it, please.") suspend infix fun (suspend () -> B).thenInvokeAfter(act: Action): C { val b = this@thenInvokeAfter() return act(b) } -//--------------------------- suspend () -> B ----------------------------- +// --------------------------- suspend () -> B ----------------------------- -//--------------------------- suspend (A) -> B ----------------------------- -//INVALID BECAUSE NO "A" -//suspend (A) -> B => (B) -> C -//suspend(A) -> B => suspend (B) -> C -//suspend (A) -> B => Action -//--------------------------- suspend (A) -> B ----------------------------- +// --------------------------- suspend (A) -> B ----------------------------- +// INVALID BECAUSE NO "A" +// suspend (A) -> B => (B) -> C +// suspend(A) -> B => suspend (B) -> C +// suspend (A) -> B => Action +// --------------------------- suspend (A) -> B ----------------------------- -//--------------------------- Action ----------------------------- -//Action => (B) -> C -//Error: Ambiguity +// --------------------------- Action ----------------------------- +// Action => (B) -> C +// Error: Ambiguity -//Action => suspend (B) -> C +// Action => suspend (B) -> C @Deprecated("Legacy code. Don't use it, please.") suspend inline infix fun (Action).thenInvokeAfter( crossinline f: suspend (B) -> C @@ -250,16 +250,15 @@ suspend inline infix fun (Action).thenInvokeAfter( return f(b) } -//Action => Action +// Action => Action @Deprecated("Legacy code. Don't use it, please.") suspend infix fun (Action).thenInvokeAfter(act: Action): C { val b = this@thenInvokeAfter(Unit) return act(b) } -//--------------------------- Action ----------------------------- - -//=============================== thenInvokeAfter ============================================= +// --------------------------- Action ----------------------------- +// =============================== thenInvokeAfter ============================================= // ---------------------------------- .fixUnit() ------------------------------------------- @Deprecated("Legacy code. Don't use it, please.") @@ -296,4 +295,4 @@ fun (Action).lambda(): suspend () -> B = { @Deprecated("Legacy code. Don't use it, please.") fun (A).lambda(): suspend () -> A = suspend { this -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Composition2.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Composition2.kt index 49cbb5f916..03274e8937 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Composition2.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Composition2.kt @@ -8,13 +8,13 @@ import arrow.core.Some * Non suspend function composition. !EXPERIMENTAL! */ -//Cases: -//A -//() -> B -//(A) -> B +// Cases: +// A +// () -> B +// (A) -> B -//Eligible 2nd position -//(A) -> B +// Eligible 2nd position +// (A) -> B // --------- A (asParamTo2) ------------------------- @Deprecated("Legacy code. Don't use it, please.") @@ -23,20 +23,19 @@ inline infix fun A.asParamTo2(crossinline f: (A) -> B): () -> B = { } // --------- A (asParamTo2) ------------------------- -//() -> B => (B) -> C +// () -> B => (B) -> C @Deprecated("Legacy code. Don't use it, please.") inline infix fun (() -> B).then2(crossinline f: (B) -> C): () -> C = { f(this()) } -//(A) -> B => (B) -> C +// (A) -> B => (B) -> C @Deprecated("Legacy code. Don't use it, please.") inline infix fun ((A) -> B).then2(crossinline f: (B) -> C): (A) -> C = { a -> val b = this(a) f(b) } - @Deprecated("Legacy code. Don't use it, please.") inline infix fun ((A) -> Option).thenMaybe2(crossinline f: (B) -> C): (A) -> Option = { a -> diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/CompositionN.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/CompositionN.kt index dfa588af80..4d1b846ff4 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/CompositionN.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/CompositionN.kt @@ -2,7 +2,7 @@ package com.ivy.frp import com.ivy.frp.action.Action -//TODO: Implement properly +// TODO: Implement properly @Deprecated("Legacy code. Don't use it, please.") infix fun ((A, B) -> C).then(f: (C) -> D): (A, B) -> D = { a, b -> @@ -27,4 +27,4 @@ suspend infix fun (suspend (A, B) -> C).then(f: suspend (C) -> D): infix fun ((A, B, C) -> D).then(f: (D) -> E): (A, B, C) -> E = { a, b, c -> val d = this(a, b, c) f(d) -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/OnScreenStart.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/OnScreenStart.kt index 0f8a8b3205..5cf80839ae 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/OnScreenStart.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/OnScreenStart.kt @@ -16,4 +16,4 @@ fun onScreenStart( start() onDispose { cleanUp() } } -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Utils.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Utils.kt index 1fccbf2f25..5f4b0555ae 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Utils.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/Utils.kt @@ -18,4 +18,4 @@ suspend fun Collection.filterSuspend( return this.filter { a -> predicate(a) } -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/Action.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/Action.kt index f0eea69b4c..4f281c260f 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/Action.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/Action.kt @@ -32,4 +32,4 @@ abstract class Action { withContext(Dispatchers.Main) { return@withContext action() } -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/CompositionSum.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/CompositionSum.kt index 3731e0a47a..2ee36b936e 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/CompositionSum.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/CompositionSum.kt @@ -28,4 +28,4 @@ suspend inline infix fun (Action>).thenSum( acc + value(b) } ) - } \ No newline at end of file + } diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/FPAction.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/FPAction.kt index b4d3ddb11a..a03e5fae1f 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/FPAction.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/action/FPAction.kt @@ -18,4 +18,4 @@ abstract class FPAction : Action() { compose().invoke() } } -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/monad/Res.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/monad/Res.kt index 7faf219cb2..1c676d82aa 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/monad/Res.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/monad/Res.kt @@ -4,7 +4,6 @@ import com.ivy.frp.action.Action import com.ivy.frp.asParamTo import com.ivy.frp.thenInvokeAfter - @Deprecated("Legacy code. Use Arrow's Either") sealed class Res { data class Ok(val data: T) : Res() @@ -61,7 +60,6 @@ inline infix fun (suspend () -> Res).mapError( } // ------------------ mapError -------------------------------------- - // ------------------ mapSuccess -------------------------------------- @Deprecated("Legacy code. Don't use it, please.") inline infix fun (suspend (A) -> Res).mapSuccess( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/monad/ResComposition.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/monad/ResComposition.kt index 3982718cbd..fbcf23a98b 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/monad/ResComposition.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/monad/ResComposition.kt @@ -2,7 +2,7 @@ package com.ivy.frp.monad import com.ivy.frp.action.Action -//Action -> Action +// Action -> Action @Deprecated("Legacy code. Don't use it, please.") infix fun (Action>).thenIfSuccess( act: Action> @@ -13,7 +13,7 @@ infix fun (Action>).thenIfSuccess( } } -//Action -> Suspend fun +// Action -> Suspend fun @Deprecated("Legacy code. Don't use it, please.") inline infix fun (Action>).thenIfSuccess( crossinline f: suspend (T1) -> Res @@ -24,7 +24,7 @@ inline infix fun (Action>).thenIfSuccess( } } -//Suspend fun -> Action +// Suspend fun -> Action @Deprecated("Legacy code. Don't use it, please.") infix fun (suspend (A) -> Res).thenIfSuccess( act: Action> @@ -35,7 +35,7 @@ infix fun (suspend (A) -> Res).thenIfSuccess( } } -//Suspend fun -> Suspend fund +// Suspend fun -> Suspend fund @Deprecated("Legacy code. Don't use it, please.") inline infix fun (suspend (A) -> Res).thenIfSuccess( crossinline f: suspend (T1) -> Res @@ -46,7 +46,7 @@ inline infix fun (suspend (A) -> Res).thenIfSuccess( } } -//Suspend fun () -> Suspend fun () +// Suspend fun () -> Suspend fun () @Deprecated("Legacy code. Don't use it, please.") inline infix fun (suspend () -> Res).thenIfSuccess( crossinline f: suspend (T1) -> Res @@ -65,4 +65,4 @@ infix fun (suspend () -> Res).thenIfSuccess( is Res.Err -> res1 is Res.Ok -> act(res1.data) } -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/test/TestIdlingResource.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/test/TestIdlingResource.kt index 6b6674abcf..63b40a33e2 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/test/TestIdlingResource.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/test/TestIdlingResource.kt @@ -23,4 +23,4 @@ object TestIdlingResource { fun get(): Int { return counter.get() } -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/test/TestingContext.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/test/TestingContext.kt index 74754f0d09..d1b8f6369f 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/test/TestingContext.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/test/TestingContext.kt @@ -3,4 +3,4 @@ package com.ivy.frp.test @Deprecated("Legacy code. Don't use it, please.") object TestingContext { var inTest = false -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/viewmodel/FRPViewModel.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/viewmodel/FRPViewModel.kt index e5350de17a..dec0c15fc8 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/viewmodel/FRPViewModel.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/viewmodel/FRPViewModel.kt @@ -33,4 +33,4 @@ abstract class FRPViewModel : ViewModel() { _state.value = update(stateVal()) return stateVal() } -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/viewmodel/ViewmodelUtils.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/viewmodel/ViewmodelUtils.kt index bc6ab1698a..8e5dab0109 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/frp/viewmodel/ViewmodelUtils.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/frp/viewmodel/ViewmodelUtils.kt @@ -6,4 +6,4 @@ import kotlinx.coroutines.flow.StateFlow @Deprecated("Legacy code. Don't use it, please.") fun MutableStateFlow.readOnly(): StateFlow { return this -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/IvyColorPicker.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/IvyColorPicker.kt index da36f36c43..b8cb0f796c 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/IvyColorPicker.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/IvyColorPicker.kt @@ -163,4 +163,4 @@ private fun ColorItem( } Spacer(Modifier.width(if (selected) 16.dp else 24.dp)) -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/IvyColors.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/IvyColors.kt index fbd79e6a61..49e5622de8 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/IvyColors.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/IvyColors.kt @@ -17,6 +17,7 @@ import com.ivy.legacy.utils.densityScope @Deprecated("Old design system. Use `:ivy-design` and Material3") val White = Color(0xFFFAFAFA) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Black = Color(0xFF111114) @@ -35,12 +36,14 @@ val Orange = Color(0xFFF29F30) @Deprecated("Old design system. Use `:ivy-design` and Material3") val Red = Color(0xFFFF4060) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Red3 = Color(0xFFFF4CA6) // Light @Deprecated("Old design system. Use `:ivy-design` and Material3") val IvyLight = Color(0xFFD5CCFF) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val GreenLight = Color(0xFFAAF2E0) @@ -49,12 +52,14 @@ val OrangeLight = Color(0xFFFFDEB3) @Deprecated("Old design system. Use `:ivy-design` and Material3") val RedLight = Color(0xFFFFCCD5) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Red3Light = Color(0xFFFFCCE6) // Dark @Deprecated("Old design system. Use `:ivy-design` and Material3") val IvyDark = Color(0xFF352680) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Purple1Dark = Color(0xFF622680) @@ -67,8 +72,10 @@ val OrangeDark = Color(0xFF734B17) @Deprecated("Old design system. Use `:ivy-design` and Material3") val MediumBlack = Color(0xFF2B2C2D) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Gray = Color(0xFF939199) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val MediumWhite = Color(0xFFEFEEF0) @@ -77,10 +84,13 @@ val Transparent = Color(0x00000000) @Deprecated("Old design system. Use `:ivy-design` and Material3") val GradientRed = Gradient(Red, Color(0xFFFF99AB)) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val GradientGreen = Gradient(Green, Color(0xFF49F2C8)) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val GradientOrangeRevert = Gradient(Color(0xFFF2CD9E), Orange) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val GradientIvy = Gradient(Ivy, Color(0xFFAA99FF)) diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/AddPrimaryAttributeButton.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/AddPrimaryAttributeButton.kt index 58b6bcd554..5ac5b1731d 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/AddPrimaryAttributeButton.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/AddPrimaryAttributeButton.kt @@ -18,8 +18,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview +import com.ivy.resources.R @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BackBottomBar.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BackBottomBar.kt index 693ebfe6b9..ccc8085566 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BackBottomBar.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BackBottomBar.kt @@ -10,10 +10,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.rotate import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.ivy.resources.R -import com.ivy.wallet.ui.theme.gradientCutBackgroundTop import com.ivy.legacy.utils.navigationBarInset import com.ivy.legacy.utils.toDensityDp +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.gradientCutBackgroundTop @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BufferBattery.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BufferBattery.kt index b6a5c46b96..0540f4c129 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BufferBattery.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BufferBattery.kt @@ -24,15 +24,15 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview +import com.ivy.legacy.utils.thenIf +import com.ivy.resources.R import com.ivy.wallet.ui.theme.Green import com.ivy.wallet.ui.theme.Ivy import com.ivy.wallet.ui.theme.Orange import com.ivy.wallet.ui.theme.Red import com.ivy.wallet.ui.theme.White import com.ivy.wallet.ui.theme.wallet.AmountCurrencyB2Row -import com.ivy.legacy.utils.thenIf import kotlin.math.abs @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ChangeTransactionTypeModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ChangeTransactionTypeModal.kt index d1003a08db..73a7eb346e 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ChangeTransactionTypeModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ChangeTransactionTypeModal.kt @@ -25,10 +25,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.ivy.base.model.TransactionType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.legacy.IvyWalletPreview -import com.ivy.base.model.TransactionType import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gradient import com.ivy.wallet.ui.theme.GradientGreen diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/CurrencyPicker.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/CurrencyPicker.kt index 0cdc10481d..93b337e0c1 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/CurrencyPicker.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/CurrencyPicker.kt @@ -45,20 +45,20 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R -import com.ivy.wallet.domain.data.IvyCurrency import com.ivy.legacy.IvyWalletComponentPreview -import com.ivy.wallet.ui.theme.GradientGreen -import com.ivy.wallet.ui.theme.GradientIvy -import com.ivy.wallet.ui.theme.Ivy -import com.ivy.wallet.ui.theme.White -import com.ivy.wallet.ui.theme.modal.DURATION_MODAL_ANIM import com.ivy.legacy.utils.addKeyboardListener import com.ivy.legacy.utils.densityScope import com.ivy.legacy.utils.hideKeyboard import com.ivy.legacy.utils.keyboardOnlyWindowInsets import com.ivy.legacy.utils.onScreenStart import com.ivy.legacy.utils.toLowerCaseLocal +import com.ivy.resources.R +import com.ivy.wallet.domain.data.IvyCurrency +import com.ivy.wallet.ui.theme.GradientGreen +import com.ivy.wallet.ui.theme.GradientIvy +import com.ivy.wallet.ui.theme.Ivy +import com.ivy.wallet.ui.theme.White +import com.ivy.wallet.ui.theme.modal.DURATION_MODAL_ANIM import java.util.Locale @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/CustomExchangeRateCard.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/CustomExchangeRateCard.kt index 627a866214..a0a0ab56e3 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/CustomExchangeRateCard.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/CustomExchangeRateCard.kt @@ -21,10 +21,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview -import com.ivy.wallet.ui.theme.Orange import com.ivy.legacy.utils.format +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.Orange @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/GradientCut.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/GradientCut.kt index 1d947f092b..8187c5d1c0 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/GradientCut.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/GradientCut.kt @@ -13,9 +13,9 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import com.ivy.design.l0_system.UI +import com.ivy.legacy.utils.thenIf import com.ivy.wallet.ui.theme.Gradient import com.ivy.wallet.ui.theme.Transparent -import com.ivy.legacy.utils.thenIf @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable @@ -35,4 +35,4 @@ fun BoxWithConstraintsScope.GradientCutBottom( .align(Alignment.BottomCenter) .alpha(alpha = alpha) ) -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IntervalPickerRow.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IntervalPickerRow.kt index 4adff85f06..3b45e6b2eb 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IntervalPickerRow.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IntervalPickerRow.kt @@ -23,18 +23,18 @@ import androidx.compose.ui.draw.rotate import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.ivy.data.model.IntervalType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview import com.ivy.legacy.forDisplay -import com.ivy.wallet.ui.theme.Gradient -import com.ivy.wallet.ui.theme.GradientIvy -import com.ivy.wallet.ui.theme.White import com.ivy.legacy.utils.capitalizeLocal import com.ivy.legacy.utils.isNotNullOrBlank import com.ivy.legacy.utils.selectEndTextFieldValue -import com.ivy.data.model.IntervalType +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.Gradient +import com.ivy.wallet.ui.theme.GradientIvy +import com.ivy.wallet.ui.theme.White @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyBorderButton.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyBorderButton.kt index 1c13d44330..639e5bb924 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyBorderButton.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyBorderButton.kt @@ -23,8 +23,8 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview +import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gradient @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyButton.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyButton.kt index 0df89a6fde..6679eaa2b7 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyButton.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyButton.kt @@ -25,14 +25,14 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview +import com.ivy.legacy.utils.drawColoredShadow +import com.ivy.legacy.utils.thenIf +import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gradient import com.ivy.wallet.ui.theme.GradientIvy import com.ivy.wallet.ui.theme.Ivy import com.ivy.wallet.ui.theme.White -import com.ivy.legacy.utils.drawColoredShadow -import com.ivy.legacy.utils.thenIf @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyCheckbox.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyCheckbox.kt index 4b3f07525d..547894929b 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyCheckbox.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyCheckbox.kt @@ -20,9 +20,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview import com.ivy.legacy.utils.clickableNoIndication +import com.ivy.resources.R @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyCircleButton.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyCircleButton.kt index 34cb0c086f..2bb778865a 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyCircleButton.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvyCircleButton.kt @@ -13,14 +13,14 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview +import com.ivy.legacy.utils.drawColoredShadow +import com.ivy.legacy.utils.thenIf +import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gradient import com.ivy.wallet.ui.theme.GradientIvy import com.ivy.wallet.ui.theme.GradientRed import com.ivy.wallet.ui.theme.White -import com.ivy.legacy.utils.drawColoredShadow -import com.ivy.legacy.utils.thenIf @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvySwitch.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvySwitch.kt index 231d7d4fc5..443a153671 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvySwitch.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/IvySwitch.kt @@ -15,9 +15,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.legacy.IvyWalletComponentPreview +import com.ivy.legacy.utils.springBounce import com.ivy.wallet.ui.theme.Gray import com.ivy.wallet.ui.theme.Green -import com.ivy.legacy.utils.springBounce @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ListItem.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ListItem.kt index 6d94f5ad89..53a002ac91 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ListItem.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ListItem.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.legacy.utils.thenIf import com.ivy.wallet.ui.theme.components.ItemIconSDefaultIcon import com.ivy.wallet.ui.theme.findContrastTextColor -import com.ivy.legacy.utils.thenIf @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/OnboardingComponents.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/OnboardingComponents.kt index 196957a8af..cba878eb2c 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/OnboardingComponents.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/OnboardingComponents.kt @@ -21,12 +21,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview -import com.ivy.wallet.ui.theme.Gradient -import com.ivy.wallet.ui.theme.GradientIvy import com.ivy.legacy.utils.drawColoredShadow import com.ivy.legacy.utils.thenIf +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.Gradient +import com.ivy.wallet.ui.theme.GradientIvy @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ReorderModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ReorderModal.kt index 6227b6b1cc..5c2ea21ebf 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ReorderModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/ReorderModal.kt @@ -24,13 +24,13 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.legacy.utils.numberBetween +import com.ivy.legacy.utils.swap import com.ivy.resources.R import com.ivy.wallet.domain.data.Reorderable import com.ivy.wallet.ui.theme.GradientGreen import com.ivy.wallet.ui.theme.White import com.ivy.wallet.ui.theme.modal.IvyModal -import com.ivy.legacy.utils.numberBetween -import com.ivy.legacy.utils.swap import java.util.* @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/WrapContentRow.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/WrapContentRow.kt index ce0a52fa7d..1735749ec9 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/WrapContentRow.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/WrapContentRow.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.ivy.legacy.datamodel.Category import com.ivy.design.l0_system.UI import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.datamodel.Category @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/charts/linechart/IvyLineChart.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/charts/linechart/IvyLineChart.kt index 3f7f974261..59a8dde786 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/charts/linechart/IvyLineChart.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/charts/linechart/IvyLineChart.kt @@ -28,13 +28,13 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.ivy.legacy.IvyWalletComponentPreview import com.ivy.design.l0_system.UI +import com.ivy.legacy.IvyWalletComponentPreview import com.ivy.legacy.data.model.Month +import com.ivy.legacy.utils.lerp import com.ivy.wallet.ui.theme.Gray import com.ivy.wallet.ui.theme.Green import com.ivy.wallet.ui.theme.Ivy -import com.ivy.legacy.utils.lerp import timber.log.Timber import java.text.DecimalFormat import kotlin.math.pow diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/AddKeywordModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/AddKeywordModal.kt index bc0850c158..40be11efc0 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/AddKeywordModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/AddKeywordModal.kt @@ -17,13 +17,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletPreview import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R -import com.ivy.wallet.ui.theme.components.IvyTitleTextField +import com.ivy.legacy.IvyWalletPreview import com.ivy.legacy.utils.onScreenStart import com.ivy.legacy.utils.selectEndTextFieldValue +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.components.IvyTitleTextField import java.util.UUID @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChooseIconModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChooseIconModal.kt index bc1068c134..fe728c6319 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChooseIconModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChooseIconModal.kt @@ -28,19 +28,19 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletPreview import com.ivy.design.l0_system.UI import com.ivy.design.l1_buildingBlocks.DividerW import com.ivy.design.l1_buildingBlocks.IvyText import com.ivy.design.l1_buildingBlocks.SpacerHor import com.ivy.design.l1_buildingBlocks.SpacerVer +import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.utils.hideKeyboard +import com.ivy.legacy.utils.onScreenStart +import com.ivy.legacy.utils.thenIf import com.ivy.resources.R import com.ivy.wallet.ui.theme.Ivy import com.ivy.wallet.ui.theme.components.ItemIconS import com.ivy.wallet.ui.theme.dynamicContrast -import com.ivy.legacy.utils.hideKeyboard -import com.ivy.legacy.utils.onScreenStart -import com.ivy.legacy.utils.thenIf import java.util.UUID @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChoosePeriodModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChoosePeriodModal.kt index 6da663b28c..45164d59fa 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChoosePeriodModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChoosePeriodModal.kt @@ -30,6 +30,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.ivy.data.model.IntervalType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.legacy.IvyWalletPreview @@ -44,7 +45,6 @@ import com.ivy.legacy.utils.dateNowUTC import com.ivy.legacy.utils.formatDateOnlyWithYear import com.ivy.legacy.utils.onScreenStart import com.ivy.legacy.utils.timeNowUTC -import com.ivy.data.model.IntervalType import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gradient import com.ivy.wallet.ui.theme.GradientIvy @@ -381,9 +381,13 @@ private fun IntervalFromToDate( .padding( vertical = 16.dp, ), - text = if (border == IntervalBorder.FROM) stringResource(R.string.from) else stringResource( - R.string.to - ), + text = if (border == IntervalBorder.FROM) { + stringResource(R.string.from) + } else { + stringResource( + R.string.to + ) + }, style = UI.typo.b2.style( fontWeight = FontWeight.ExtraBold, color = if (dateTime != null) Green else UI.colors.pureInverse @@ -490,7 +494,7 @@ private fun AllTime( onSelected: (com.ivy.legacy.data.model.FromToTimeRange?) -> Unit, ) { val active = timeRange != null && timeRange.from == null && - timeRange.to != null && timeRange.to!!.isAfter(timeNowUTC()) + timeRange.to != null && timeRange.to!!.isAfter(timeNowUTC()) Text( modifier = Modifier diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChooseStartDateOfMonthModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChooseStartDateOfMonthModal.kt index 67fa9e913d..9e6edc9f06 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChooseStartDateOfMonthModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/ChooseStartDateOfMonthModal.kt @@ -22,13 +22,13 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletPreview import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.utils.thenIf import com.ivy.resources.R import com.ivy.wallet.ui.theme.Ivy import com.ivy.wallet.ui.theme.White -import com.ivy.legacy.utils.thenIf import java.util.UUID @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/CurrencyModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/CurrencyModal.kt index 7a4631c22b..91866a7831 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/CurrencyModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/CurrencyModal.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletPreview import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.legacy.IvyWalletPreview import com.ivy.resources.R import com.ivy.wallet.domain.data.IvyCurrency import com.ivy.wallet.ui.theme.Gray diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/DeleteModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/DeleteModal.kt index 33fe8c3afd..9f2c1f52b7 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/DeleteModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/DeleteModal.kt @@ -158,7 +158,7 @@ fun BoxWithConstraintsScope.DeleteConfirmationModal( onAccountNameChange(newValue.text) } - LaunchedEffect(key1 = true){ + LaunchedEffect(key1 = true) { delay(50) focusRequester.requestFocus() } diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModal.kt index 0628778b37..276e77de4d 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModal.kt @@ -59,6 +59,7 @@ import kotlin.math.roundToInt @Deprecated("Old design system. Use `:ivy-design` and Material3") private const val DURATION_BACKGROUND_BLUR_ANIM = 400 + @Deprecated("Old design system. Use `:ivy-design` and Material3") const val DURATION_MODAL_ANIM = 200 diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModalComponents.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModalComponents.kt index c0ffc5371e..91ce9b6795 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModalComponents.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModalComponents.kt @@ -14,7 +14,6 @@ import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.resources.R import com.ivy.wallet.ui.theme.GradientGreen -import com.ivy.wallet.ui.theme.GradientIvy import com.ivy.wallet.ui.theme.GradientRed import com.ivy.wallet.ui.theme.White import com.ivy.wallet.ui.theme.components.IvyButton diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModalDomainComponents.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModalDomainComponents.kt index 699ef5a0dc..ee2c14553e 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModalDomainComponents.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModalDomainComponents.kt @@ -15,9 +15,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.legacy.utils.clickableNoIndication import com.ivy.wallet.ui.theme.components.BalanceRow import com.ivy.wallet.ui.theme.components.IvyDividerLine -import com.ivy.legacy.utils.clickableNoIndication @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/LoanModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/LoanModal.kt index 7fd3a738a8..6205f45a4a 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/LoanModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/LoanModal.kt @@ -34,19 +34,19 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.Loan -import com.ivy.domain.legacy.ui.IvyColorPicker +import com.ivy.data.model.LoanType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.domain.legacy.ui.IvyColorPicker import com.ivy.frp.test.TestingContext import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.Loan import com.ivy.legacy.utils.getDefaultFIATCurrency import com.ivy.legacy.utils.isNotNullOrBlank import com.ivy.legacy.utils.onScreenStart import com.ivy.legacy.utils.selectEndTextFieldValue import com.ivy.legacy.utils.thenIf -import com.ivy.data.model.LoanType import com.ivy.resources.R import com.ivy.wallet.domain.data.IvyCurrency import com.ivy.wallet.domain.deprecated.logic.model.CreateAccountData @@ -140,9 +140,9 @@ fun BoxWithConstraintsScope.LoanModal( ) { accountChangeModal = loan != null && modal.selectedAccount != null && currencyCode != ( - modal.selectedAccount.currency - ?: modal.baseCurrency - ) + modal.selectedAccount.currency + ?: modal.baseCurrency + ) if (!accountChangeModal) { save( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/LoanRecordModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/LoanRecordModal.kt index a9a01367a2..a0060c3689 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/LoanRecordModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/LoanRecordModal.kt @@ -29,12 +29,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.datamodel.Account -import com.ivy.legacy.datamodel.LoanRecord import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.frp.test.TestingContext import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.datamodel.LoanRecord import com.ivy.legacy.ivyWalletCtx import com.ivy.legacy.legacy.ui.theme.modal.ModalNameInput import com.ivy.legacy.utils.convertUTCtoLocal @@ -133,7 +133,7 @@ fun BoxWithConstraintsScope.LoanRecordModal( ) { accountChangeConformationModal = initialRecord != null && modal.selectedAccount != null && - modal.baseCurrency != currencyCode && currencyCode != modal.loanAccountCurrencyCode + modal.baseCurrency != currencyCode && currencyCode != modal.loanAccountCurrencyCode if (!accountChangeConformationModal) { save( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/MonthPickerModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/MonthPickerModal.kt index fbcb4a7031..f5973c4013 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/MonthPickerModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/MonthPickerModal.kt @@ -20,20 +20,20 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletPreview -import com.ivy.legacy.data.model.Month.Companion.monthsList import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R -import com.ivy.wallet.ui.theme.Gradient -import com.ivy.wallet.ui.theme.Ivy -import com.ivy.wallet.ui.theme.components.WrapContentRow -import com.ivy.wallet.ui.theme.findContrastTextColor +import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.data.model.Month.Companion.monthsList import com.ivy.legacy.utils.dateNowUTC import com.ivy.legacy.utils.drawColoredShadow import com.ivy.legacy.utils.hideKeyboard import com.ivy.legacy.utils.onScreenStart import com.ivy.legacy.utils.thenIf +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.Gradient +import com.ivy.wallet.ui.theme.Ivy +import com.ivy.wallet.ui.theme.components.WrapContentRow +import com.ivy.wallet.ui.theme.findContrastTextColor import java.time.LocalDate import java.util.UUID diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/NameModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/NameModal.kt index f7671cda97..3212f0db39 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/NameModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/NameModal.kt @@ -15,12 +15,12 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletPreview import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.utils.selectEndTextFieldValue import com.ivy.resources.R import com.ivy.wallet.ui.theme.components.IvyTitleTextField -import com.ivy.legacy.utils.selectEndTextFieldValue import java.util.UUID @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/RecurringRuleModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/RecurringRuleModal.kt index c5652f58fc..90cc6f33b0 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/RecurringRuleModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/RecurringRuleModal.kt @@ -32,6 +32,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.ivy.data.model.IntervalType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.legacy.IvyWalletCtx @@ -46,7 +47,6 @@ import com.ivy.legacy.utils.hideKeyboard import com.ivy.legacy.utils.onScreenStart import com.ivy.legacy.utils.thenIf import com.ivy.legacy.utils.timeNowUTC -import com.ivy.data.model.IntervalType import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gradient import com.ivy.wallet.ui.theme.GradientIvy diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/AccountModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/AccountModal.kt index a0d215df42..7bda684a94 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/AccountModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/AccountModal.kt @@ -26,13 +26,18 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.domain.legacy.ui.IvyColorPicker -import com.ivy.legacy.IvyWalletPreview import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.domain.legacy.ui.IvyColorPicker +import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.datamodel.Account +import com.ivy.legacy.utils.isNotNullOrBlank +import com.ivy.legacy.utils.onScreenStart +import com.ivy.legacy.utils.selectEndTextFieldValue +import com.ivy.legacy.utils.toLowerCaseLocal +import com.ivy.legacy.utils.toUpperCaseLocal import com.ivy.resources.R import com.ivy.wallet.domain.data.IvyCurrency -import com.ivy.legacy.datamodel.Account import com.ivy.wallet.domain.deprecated.logic.model.CreateAccountData import com.ivy.wallet.ui.theme.Gray import com.ivy.wallet.ui.theme.Ivy @@ -43,11 +48,6 @@ import com.ivy.wallet.ui.theme.modal.IvyModal import com.ivy.wallet.ui.theme.modal.ModalAddSave import com.ivy.wallet.ui.theme.modal.ModalAmountSection import com.ivy.wallet.ui.theme.modal.ModalTitle -import com.ivy.legacy.utils.isNotNullOrBlank -import com.ivy.legacy.utils.onScreenStart -import com.ivy.legacy.utils.selectEndTextFieldValue -import com.ivy.legacy.utils.toLowerCaseLocal -import com.ivy.legacy.utils.toUpperCaseLocal import java.util.UUID @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/AmountModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/AmountModal.kt index 680b23aafe..2383cc13ec 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/AmountModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/AmountModal.kt @@ -224,7 +224,7 @@ fun AmountInput( decimalCountMax: Int = 2, setAmount: (String) -> Unit, - ) { +) { var firstInput by remember { mutableStateOf(true) } AmountKeyboard( diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/CategoryModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/CategoryModal.kt index 6160d14ad7..7f960b2246 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/CategoryModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/CategoryModal.kt @@ -35,8 +35,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.domain.legacy.ui.IvyColorPicker import com.ivy.legacy.IvyWalletPreview -import com.ivy.resources.R import com.ivy.legacy.datamodel.Category +import com.ivy.legacy.utils.hideKeyboard +import com.ivy.legacy.utils.isNotNullOrBlank +import com.ivy.legacy.utils.onScreenStart +import com.ivy.legacy.utils.selectEndTextFieldValue +import com.ivy.resources.R import com.ivy.wallet.domain.deprecated.logic.model.CreateCategoryData import com.ivy.wallet.ui.theme.Ivy import com.ivy.wallet.ui.theme.components.ItemIconMDefaultIcon @@ -46,10 +50,6 @@ import com.ivy.wallet.ui.theme.modal.ChooseIconModal import com.ivy.wallet.ui.theme.modal.IvyModal import com.ivy.wallet.ui.theme.modal.ModalAddSave import com.ivy.wallet.ui.theme.modal.ModalTitle -import com.ivy.legacy.utils.hideKeyboard -import com.ivy.legacy.utils.isNotNullOrBlank -import com.ivy.legacy.utils.onScreenStart -import com.ivy.legacy.utils.selectEndTextFieldValue import java.util.UUID @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/ChooseCategoryModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/ChooseCategoryModal.kt index 037f079b17..3e357b61a0 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/ChooseCategoryModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/ChooseCategoryModal.kt @@ -28,11 +28,15 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletPreview import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R +import com.ivy.legacy.IvyWalletPreview import com.ivy.legacy.datamodel.Category +import com.ivy.legacy.utils.drawColoredShadow +import com.ivy.legacy.utils.hideKeyboard +import com.ivy.legacy.utils.onScreenStart +import com.ivy.legacy.utils.thenIf +import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gradient import com.ivy.wallet.ui.theme.Ivy import com.ivy.wallet.ui.theme.Orange @@ -46,10 +50,6 @@ import com.ivy.wallet.ui.theme.modal.IvyModal import com.ivy.wallet.ui.theme.modal.ModalSkip import com.ivy.wallet.ui.theme.modal.ModalTitle import com.ivy.wallet.ui.theme.toComposeColor -import com.ivy.legacy.utils.drawColoredShadow -import com.ivy.legacy.utils.hideKeyboard -import com.ivy.legacy.utils.onScreenStart -import com.ivy.legacy.utils.thenIf import java.util.UUID @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/DescriptionModal.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/DescriptionModal.kt index 2439df171c..e0ba3946d7 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/DescriptionModal.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/DescriptionModal.kt @@ -24,18 +24,18 @@ import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletPreview -import com.ivy.legacy.rootView import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.design.utils.hideKeyboard +import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.rootView +import com.ivy.legacy.utils.clickableNoIndication +import com.ivy.legacy.utils.onScreenStart +import com.ivy.legacy.utils.selectEndTextFieldValue import com.ivy.resources.R import com.ivy.wallet.ui.theme.components.IvyDescriptionTextField import com.ivy.wallet.ui.theme.modal.IvyModal import com.ivy.wallet.ui.theme.modal.ModalDynamicPrimaryAction -import com.ivy.legacy.utils.clickableNoIndication -import com.ivy.legacy.utils.onScreenStart -import com.ivy.legacy.utils.selectEndTextFieldValue import java.util.UUID @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/AmountCurrency.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/AmountCurrency.kt index 963c9b9d39..6c24388aec 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/AmountCurrency.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/AmountCurrency.kt @@ -71,13 +71,18 @@ fun AmountCurrencyB1( currency: String, amountFontWeight: FontWeight = FontWeight.Bold, textColor: Color = UI.colors.pureInverse, - shortenBigNumbers: Boolean = false + shortenBigNumbers: Boolean = false, + hideIncome: Boolean = false ) { val shortAmount = shortenBigNumbers && shouldShortAmount(amount) - + val text = if (hideIncome) { + "****" + } else { + if (shortAmount) shortenAmount(amount) else amount.format(currency) + } Text( modifier = Modifier.testTag("amount_currency_b1"), - text = if (shortAmount) shortenAmount(amount) else amount.format(currency), + text = text, style = UI.typo.nB1.style( fontWeight = amountFontWeight, color = textColor diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/PeriodSelector.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/PeriodSelector.kt index fcb36d6ee7..df87ab476b 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/PeriodSelector.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/PeriodSelector.kt @@ -21,11 +21,11 @@ import androidx.compose.ui.draw.rotate import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.ivy.design.l0_system.UI +import com.ivy.design.l0_system.style import com.ivy.legacy.IvyWalletComponentPreview import com.ivy.legacy.data.model.TimePeriod import com.ivy.legacy.ivyWalletCtx -import com.ivy.design.l0_system.UI -import com.ivy.design.l0_system.style import com.ivy.resources.R import com.ivy.wallet.ui.theme.components.IvyIcon diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/notification/TransactionReminderWorker.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/notification/TransactionReminderWorker.kt index 38400b2558..54190511bf 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/notification/TransactionReminderWorker.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/notification/TransactionReminderWorker.kt @@ -7,11 +7,11 @@ import androidx.hilt.work.HiltWorker import androidx.work.CoroutineWorker import androidx.work.WorkerParameters import com.ivy.base.legacy.stringRes +import com.ivy.data.db.dao.read.TransactionDao import com.ivy.domain.AppStarter import com.ivy.legacy.data.SharedPrefs import com.ivy.legacy.utils.atEndOfDay import com.ivy.legacy.utils.dateNowUTC -import com.ivy.data.db.dao.read.TransactionDao import com.ivy.resources.R import com.ivy.wallet.android.notification.IvyNotificationChannel import com.ivy.wallet.android.notification.NotificationService @@ -59,7 +59,7 @@ class TransactionReminderWorker @AssistedInject constructor( 1, appStarter.getRootIntent(), PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_UPDATE_CURRENT - or PendingIntent.FLAG_IMMUTABLE + or PendingIntent.FLAG_IMMUTABLE ) ) diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/SearchInput.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/SearchInput.kt index 8c53cbf43b..e07bc3fbbc 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/SearchInput.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/SearchInput.kt @@ -19,10 +19,10 @@ import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.Gray import com.ivy.design.l0_system.UI import com.ivy.design.l1_buildingBlocks.IvyIcon -import com.ivy.resources.R -import com.ivy.wallet.ui.theme.components.IvyBasicTextField import com.ivy.legacy.utils.onScreenStart import com.ivy.legacy.utils.selectEndTextFieldValue +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.components.IvyBasicTextField @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/IncomeExpenseCards.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/IncomeExpenseCards.kt index 5c5b846d24..c747442bed 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/IncomeExpenseCards.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/IncomeExpenseCards.kt @@ -21,11 +21,11 @@ import androidx.compose.ui.unit.dp import com.ivy.base.legacy.Transaction import com.ivy.base.legacy.TransactionHistoryItem import com.ivy.base.legacy.stringRes +import com.ivy.base.model.TransactionType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.legacy.utils.drawColoredShadow import com.ivy.legacy.utils.format -import com.ivy.base.model.TransactionType import com.ivy.resources.R import com.ivy.wallet.domain.data.IvyCurrency import com.ivy.wallet.ui.theme.Gradient diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/PrimaryAttributeColumn.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/PrimaryAttributeColumn.kt index 815deba3b4..91be2d21a9 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/PrimaryAttributeColumn.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/PrimaryAttributeColumn.kt @@ -22,10 +22,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview -import com.ivy.wallet.ui.theme.components.IvyIcon import com.ivy.legacy.utils.clickableNoIndication +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.components.IvyIcon @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/TransactionDateTime.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/TransactionDateTime.kt index dfea5fce5d..788a57b130 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/TransactionDateTime.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/TransactionDateTime.kt @@ -19,14 +19,14 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview import com.ivy.legacy.utils.convertUTCtoLocal import com.ivy.legacy.utils.formatNicely import com.ivy.legacy.utils.formatTimeOnly import com.ivy.legacy.utils.timeNowLocal -import com.ivy.wallet.ui.theme.components.IvyIcon import com.ivy.legacy.utils.timeNowUTC +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.components.IvyIcon import java.time.LocalDateTime @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Category.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Category.kt index 930f7eee32..f68b0c03a5 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Category.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Category.kt @@ -8,8 +8,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.datamodel.Category +import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gradient import com.ivy.wallet.ui.theme.components.IvyBorderButton import com.ivy.wallet.ui.theme.components.IvyButton diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Description.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Description.kt index 9be36e7334..5a5c9c6468 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Description.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Description.kt @@ -12,13 +12,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.ivy.legacy.IvyWalletComponentPreview import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style +import com.ivy.legacy.IvyWalletComponentPreview import com.ivy.legacy.ui.component.edit.PrimaryAttributeColumn +import com.ivy.legacy.utils.isNotNullOrBlank import com.ivy.resources.R import com.ivy.wallet.ui.theme.components.AddPrimaryAttributeButton -import com.ivy.legacy.utils.isNotNullOrBlank @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/DueDate.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/DueDate.kt index 8ab2be9aa7..6c3b172d5d 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/DueDate.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/DueDate.kt @@ -18,11 +18,11 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview -import com.ivy.wallet.ui.theme.components.IvyIcon import com.ivy.legacy.utils.formatDateOnly import com.ivy.legacy.utils.timeNowUTC +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.components.IvyIcon import java.time.LocalDateTime @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/EditBottomSheet.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/EditBottomSheet.kt index c38ead230d..0b40fed9ed 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/EditBottomSheet.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/EditBottomSheet.kt @@ -43,11 +43,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.ivy.legacy.datamodel.Account +import com.ivy.base.model.TransactionType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.frp.test.TestingContext import com.ivy.legacy.IvyWalletPreview +import com.ivy.legacy.datamodel.Account import com.ivy.legacy.ivyWalletCtx import com.ivy.legacy.utils.addKeyboardListener import com.ivy.legacy.utils.clickableNoIndication @@ -62,7 +63,6 @@ import com.ivy.legacy.utils.onScreenStart import com.ivy.legacy.utils.springBounce import com.ivy.legacy.utils.thenIf import com.ivy.legacy.utils.verticalSwipeListener -import com.ivy.base.model.TransactionType import com.ivy.resources.R import com.ivy.wallet.ui.theme.Gradient import com.ivy.wallet.ui.theme.Green diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Title.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Title.kt index 506e9e0139..325290326e 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Title.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Title.kt @@ -23,12 +23,12 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.ivy.base.model.TransactionType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.legacy.IvyWalletComponentPreview import com.ivy.legacy.utils.keyboardVisibleState import com.ivy.legacy.utils.selectEndTextFieldValue -import com.ivy.base.model.TransactionType import com.ivy.resources.R import com.ivy.wallet.domain.deprecated.logic.SUGGESTIONS_LIMIT import com.ivy.wallet.ui.theme.components.IvyTitleTextField diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Toolbar.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Toolbar.kt index 7e8a63d41f..0d259395b3 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Toolbar.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/Toolbar.kt @@ -8,8 +8,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.ivy.navigation.navigation import com.ivy.base.model.TransactionType +import com.ivy.navigation.navigation import com.ivy.resources.R import com.ivy.wallet.ui.theme.components.CloseButton import com.ivy.wallet.ui.theme.components.DeleteButton diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/HistoryDateDivider.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/HistoryDateDivider.kt index 274760512a..9f748e5682 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/HistoryDateDivider.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/HistoryDateDivider.kt @@ -17,13 +17,13 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview -import com.ivy.wallet.ui.theme.Gray -import com.ivy.wallet.ui.theme.Green import com.ivy.legacy.utils.dateNowUTC import com.ivy.legacy.utils.format import com.ivy.legacy.utils.formatLocal +import com.ivy.resources.R +import com.ivy.wallet.ui.theme.Gray +import com.ivy.wallet.ui.theme.Green import java.time.LocalDate @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/TransactionCard.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/TransactionCard.kt index c83c3e0159..00dbd3e808 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/TransactionCard.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/TransactionCard.kt @@ -27,6 +27,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.base.legacy.Transaction +import com.ivy.base.model.TransactionType import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style import com.ivy.design.l1_buildingBlocks.IvyText @@ -42,7 +43,6 @@ import com.ivy.legacy.utils.isNotNullOrBlank import com.ivy.legacy.utils.timeNowUTC import com.ivy.navigation.TransactionsScreen import com.ivy.navigation.navigation -import com.ivy.base.model.TransactionType import com.ivy.resources.R import com.ivy.wallet.ui.theme.Blue import com.ivy.wallet.ui.theme.Gradient diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/TransactionSectionDivider.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/TransactionSectionDivider.kt index 03d4f56ef8..665aadf168 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/TransactionSectionDivider.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/TransactionSectionDivider.kt @@ -21,15 +21,15 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.ivy.design.l0_system.UI import com.ivy.design.l0_system.style -import com.ivy.resources.R import com.ivy.legacy.IvyWalletComponentPreview +import com.ivy.legacy.utils.clickableNoIndication +import com.ivy.legacy.utils.format +import com.ivy.legacy.utils.springBounce +import com.ivy.resources.R import com.ivy.wallet.ui.theme.Orange import com.ivy.wallet.ui.theme.Red import com.ivy.wallet.ui.theme.components.IvyDividerDot import com.ivy.wallet.ui.theme.components.IvyIcon -import com.ivy.legacy.utils.clickableNoIndication -import com.ivy.legacy.utils.format -import com.ivy.legacy.utils.springBounce @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/Utils.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/Utils.kt index ee8d4548cb..fc8ae9597d 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/Utils.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/Utils.kt @@ -1,9 +1,9 @@ package com.ivy.legacy.ui.component.transaction import androidx.compose.runtime.Composable -import com.ivy.legacy.ivyWalletCtx import com.ivy.legacy.datamodel.Account import com.ivy.legacy.datamodel.Category +import com.ivy.legacy.ivyWalletCtx import java.util.UUID @Deprecated("Old design system. Use `:ivy-design` and Material3") diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/AmountFormatting.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/AmountFormatting.kt index 367dc1e51b..4464f5b4af 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/AmountFormatting.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/AmountFormatting.kt @@ -180,7 +180,7 @@ fun formatInputAmount( val amountDouble = newlyEnteredNumberString.amountToDoubleOrNull() val decimalCountOkay = IvyCurrency.fromCode(currency)?.isCrypto == true || - decimalCount <= decimalCountMax + decimalCount <= decimalCountMax if (amountDouble != null && decimalCountOkay) { val intPart = truncate(amountDouble).toInt() val decimalPartFormatted = if (decimalPartString != null) { diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/ComposeExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/ComposeExt.kt index 017e8c8ce0..2ab0b84a4b 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/ComposeExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/ComposeExt.kt @@ -7,13 +7,10 @@ import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.draw.drawBehind -import androidx.compose.ui.draw.drawWithCache -import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Paint import androidx.compose.ui.graphics.drawscope.drawIntoCanvas import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.LocalView import androidx.compose.ui.platform.UriHandler import androidx.compose.ui.text.TextRange @@ -23,12 +20,8 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.core.graphics.Insets import androidx.core.view.WindowInsetsCompat -import androidx.lifecycle.LiveData -import androidx.lifecycle.Observer -import com.ivy.design.l0_system.Gradient import com.ivy.navigation.navigation - @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable fun windowInsets(): WindowInsetsCompat { diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/DateExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/DateExt.kt index 852ca9fcdd..ebea6f1f31 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/DateExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/DateExt.kt @@ -24,7 +24,6 @@ fun timeNowUTC(): LocalDateTime = LocalDateTime.now(ZoneOffset.UTC) @Total fun timeUTC(): LocalTime = LocalTime.now(ZoneOffset.UTC) - @Total fun dateNowUTC(): LocalDate = LocalDate.now(ZoneOffset.UTC) diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UIExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UIExt.kt index 16c26b5dd1..17ea296beb 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UIExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UIExt.kt @@ -150,4 +150,4 @@ fun hideKeyboard(view: View) { imm.hideSoftInputFromWindow(view.windowToken, 0) } catch (ignore: Exception) { } -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UiText.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UiText.kt index c9d187a9ad..0835c1eb6d 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UiText.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UiText.kt @@ -1,6 +1,5 @@ package com.ivy.legacy.utils -import android.content.Context import androidx.annotation.StringRes import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UtilExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UtilExt.kt index 463d0dc24f..ad2ed00cdf 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UtilExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/UtilExt.kt @@ -20,8 +20,8 @@ fun numberBetween(min: Double, max: Double): Double { fun getDefaultFIATCurrency(): Currency = Currency.getInstance(Locale.getDefault()) ?: Currency.getInstance("USD") - ?: Currency.getInstance("usd") ?: Currency.getAvailableCurrencies().firstOrNull() - ?: Currency.getInstance("EUR") + ?: Currency.getInstance("usd") ?: Currency.getAvailableCurrencies().firstOrNull() + ?: Currency.getInstance("EUR") fun String.toUpperCaseLocal() = this.uppercase(Locale.getDefault()) @@ -46,4 +46,4 @@ fun String.capitalizeWords(): String { fun hasLockScreen(context: Context): Boolean { val keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager return keyguardManager.isDeviceSecure -} \ No newline at end of file +} diff --git a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/ValidationExt.kt b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/ValidationExt.kt index 021d117f25..c437204ef7 100644 --- a/temp-legacy-code/src/main/java/com/ivy/legacy/utils/ValidationExt.kt +++ b/temp-legacy-code/src/main/java/com/ivy/legacy/utils/ValidationExt.kt @@ -2,4 +2,4 @@ package com.ivy.legacy.utils fun String?.isNotNullOrBlank(): Boolean { return this != null && this.isNotBlank() -} \ No newline at end of file +} diff --git a/temp-old-design/build.gradle.kts b/temp-old-design/build.gradle.kts index caae675ce7..633c35b884 100644 --- a/temp-old-design/build.gradle.kts +++ b/temp-old-design/build.gradle.kts @@ -11,4 +11,4 @@ dependencies { implementation(projects.ivyResources) implementation(projects.ivyDesign) implementation(projects.ivyDomain) -} \ No newline at end of file +} diff --git a/temp-old-design/src/main/java/com/ivy/design/IvyColorPicker.kt b/temp-old-design/src/main/java/com/ivy/design/IvyColorPicker.kt index 2537de2ff7..90af2d3d0f 100644 --- a/temp-old-design/src/main/java/com/ivy/design/IvyColorPicker.kt +++ b/temp-old-design/src/main/java/com/ivy/design/IvyColorPicker.kt @@ -71,4 +71,4 @@ val IVY_COLOR_PICKER_COLORS_PREMIUM = listOf( IvyDark, Purple1Dark, Purple2Dark, BlueDark, Blue2Dark, Blue3Dark, GreenDark, Green2Dark, Green3Dark, Green4Dark, YellowDark, OrangeDark, Orange2Dark, Orange3Dark, RedDark, Red2Dark, Red3Dark, -) \ No newline at end of file +) diff --git a/temp-old-design/src/main/java/com/ivy/design/api/systems/IvyWalletDesign.kt b/temp-old-design/src/main/java/com/ivy/design/api/systems/IvyWalletDesign.kt index 6a44e0a1a0..d8ed950324 100644 --- a/temp-old-design/src/main/java/com/ivy/design/api/systems/IvyWalletDesign.kt +++ b/temp-old-design/src/main/java/com/ivy/design/api/systems/IvyWalletDesign.kt @@ -161,10 +161,14 @@ abstract class IvyWalletDesign : IvyDesign { override val isLight = false } - Theme.AUTO -> if (isDarkModeEnabled) colors(Theme.DARK, true) else colors( - Theme.LIGHT, - false - ) + Theme.AUTO -> if (isDarkModeEnabled) { + colors(Theme.DARK, true) + } else { + colors( + Theme.LIGHT, + false + ) + } } } diff --git a/temp-old-design/src/main/java/com/ivy/design/l0_system/Colors.kt b/temp-old-design/src/main/java/com/ivy/design/l0_system/Colors.kt index 21bc2238d4..40ff0d5db1 100644 --- a/temp-old-design/src/main/java/com/ivy/design/l0_system/Colors.kt +++ b/temp-old-design/src/main/java/com/ivy/design/l0_system/Colors.kt @@ -10,32 +10,41 @@ import androidx.core.graphics.ColorUtils @Deprecated("Old design system. Use `:ivy-design` and Material3") val White = Color(0xFFFAFAFA) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Black = Color(0xFF111114) // Primary @Deprecated("Old design system. Use `:ivy-design` and Material3") val Ivy = Color(0xFF6B4DFF) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Purple = Color(0xFF6B4DFF) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Purple1 = Color(0xFFC34CFF) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Purple2 = Color(0xFFFF4CFF) @Deprecated("Old design system. Use `:ivy-design` and Material3") val Blue = Color(0xFF4CC3FF) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Blue2 = Color(0xFF45E6E6) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Blue3 = Color(0xFF457BE6) @Deprecated("Old design system. Use `:ivy-design` and Material3") val Green = Color(0xFF14CC9E) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Green2 = Color(0xFF45E67B) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Green3 = Color(0xFF96E645) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Green4 = Color(0xFFC7E62E) @@ -44,39 +53,50 @@ val Yellow = Color(0xFFFFEE33) @Deprecated("Old design system. Use `:ivy-design` and Material3") val Orange = Color(0xFFF29F30) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Orange2 = Color(0xFFE67B45) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Orange3 = Color(0xFFFFC34C) @Deprecated("Old design system. Use `:ivy-design` and Material3") val Red = Color(0xFFFF4060) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Red2 = Color(0xFFE62E2E) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Red3 = Color(0xFFFF4CA6) // Light @Deprecated("Old design system. Use `:ivy-design` and Material3") val IvyLight = Color(0xFFD5CCFF) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Purple1Light = Color(0xFFEECCFF) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Purple2Light = Color(0xFFFFBFFF) @Deprecated("Old design system. Use `:ivy-design` and Material3") val BlueLight = Color(0xFFB3E6FF) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Blue2Light = Color(0xFFB3FFFF) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Blue3Light = Color(0xFFCCDDFF) @Deprecated("Old design system. Use `:ivy-design` and Material3") val GreenLight = Color(0xFFAAF2E0) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Green2Light = Color(0xFF99FFBB) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Green3Light = Color(0xFFCCFF99) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Green4Light = Color(0xFFEEFF99) @@ -85,39 +105,50 @@ val YellowLight = Color(0xFFFFF799) @Deprecated("Old design system. Use `:ivy-design` and Material3") val OrangeLight = Color(0xFFFFDEB3) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Orange2Light = Color(0xFFFFCCB3) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Orange3Light = Color(0xFFFFDC99) @Deprecated("Old design system. Use `:ivy-design` and Material3") val RedLight = Color(0xFFFFCCD5) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Red2Light = Color(0xFFFFB3B3) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Red3Light = Color(0xFFFFCCE6) // Dark @Deprecated("Old design system. Use `:ivy-design` and Material3") val IvyDark = Color(0xFF352680) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Purple1Dark = Color(0xFF622680) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Purple2Dark = Color(0xFF802680) @Deprecated("Old design system. Use `:ivy-design` and Material3") val BlueDark = Color(0xFF266280) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Blue2Dark = Color(0xFF227373) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Blue3Dark = Color(0xFF223D73) @Deprecated("Old design system. Use `:ivy-design` and Material3") val GreenDark = Color(0xFF0A664F) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Green2Dark = Color(0xFF22733D) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Green3Dark = Color(0xFF66804D) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Green4Dark = Color(0xFF637317) @@ -126,23 +157,29 @@ val YellowDark = Color(0xFF807719) @Deprecated("Old design system. Use `:ivy-design` and Material3") val OrangeDark = Color(0xFF734B17) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Orange2Dark = Color(0xFF66371F) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Orange3Dark = Color(0xFF806226) @Deprecated("Old design system. Use `:ivy-design` and Material3") val RedDark = Color(0xFF801919) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Red2Dark = Color(0xFF802030) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Red3Dark = Color(0xFF802653) // -------------------------------------------------------------------------------------------------- @Deprecated("Old design system. Use `:ivy-design` and Material3") val MediumBlack = Color(0xFF2B2C2D) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val Gray = Color(0xFF939199) + @Deprecated("Old design system. Use `:ivy-design` and Material3") val MediumWhite = Color(0xFFEFEEF0) diff --git a/temp-old-design/src/main/java/com/ivy/design/l1_buildingBlocks/Spacers.kt b/temp-old-design/src/main/java/com/ivy/design/l1_buildingBlocks/Spacers.kt index f3899cb616..0732553c8d 100644 --- a/temp-old-design/src/main/java/com/ivy/design/l1_buildingBlocks/Spacers.kt +++ b/temp-old-design/src/main/java/com/ivy/design/l1_buildingBlocks/Spacers.kt @@ -27,4 +27,4 @@ fun RowScope.SpacerWeight( weight: Float ) { Spacer(Modifier.weight(weight)) -} \ No newline at end of file +} diff --git a/temp-old-design/src/main/java/com/ivy/design/utils/Android.kt b/temp-old-design/src/main/java/com/ivy/design/utils/Android.kt index cc8d102dd5..01588789b0 100644 --- a/temp-old-design/src/main/java/com/ivy/design/utils/Android.kt +++ b/temp-old-design/src/main/java/com/ivy/design/utils/Android.kt @@ -6,4 +6,4 @@ import android.os.Looper @Deprecated("Old design system. Use `:ivy-design` and Material3") fun postDelayed(delayMs: Long, run: () -> Unit) { Handler(Looper.getMainLooper()).postDelayed({ run() }, delayMs) -} \ No newline at end of file +} diff --git a/temp-old-design/src/main/java/com/ivy/design/utils/Animation.kt b/temp-old-design/src/main/java/com/ivy/design/utils/Animation.kt index 0a732386f7..dbfffbc355 100644 --- a/temp-old-design/src/main/java/com/ivy/design/utils/Animation.kt +++ b/temp-old-design/src/main/java/com/ivy/design/utils/Animation.kt @@ -1,6 +1,5 @@ package com.ivy.design.utils -import androidx.compose.animation.core.Spring import androidx.compose.animation.core.spring @Deprecated("Old design system. Use `:ivy-design` and Material3") @@ -9,4 +8,4 @@ fun springBounce( ) = spring( dampingRatio = 0.75f, stiffness = stiffness, -) \ No newline at end of file +) diff --git a/temp-old-design/src/main/java/com/ivy/design/utils/Compose.kt b/temp-old-design/src/main/java/com/ivy/design/utils/Compose.kt index 7211ec83fe..b7745a8a15 100644 --- a/temp-old-design/src/main/java/com/ivy/design/utils/Compose.kt +++ b/temp-old-design/src/main/java/com/ivy/design/utils/Compose.kt @@ -9,9 +9,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.platform.UriHandler import androidx.compose.ui.unit.Density -import androidx.compose.ui.unit.Dp @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable @@ -39,7 +37,6 @@ fun Modifier.thenWhen( this.logic() ?: this } - @Deprecated("Old design system. Use `:ivy-design` and Material3") fun Modifier.clickableNoIndication( onClick: () -> Unit @@ -66,7 +63,6 @@ fun onEvent( } } - @Deprecated("Old design system. Use `:ivy-design` and Material3") @Composable -fun Int.toDensityDp() = densityScope { toDp() } \ No newline at end of file +fun Int.toDensityDp() = densityScope { toDp() } diff --git a/temp-old-design/src/main/java/com/ivy/design/utils/Keyboard.kt b/temp-old-design/src/main/java/com/ivy/design/utils/Keyboard.kt index 644f6d8cc7..89e47f0ce6 100644 --- a/temp-old-design/src/main/java/com/ivy/design/utils/Keyboard.kt +++ b/temp-old-design/src/main/java/com/ivy/design/utils/Keyboard.kt @@ -5,16 +5,11 @@ import android.app.Activity import android.content.Context import android.view.View import android.view.inputmethod.InputMethodManager -import androidx.compose.animation.core.AnimationSpec -import androidx.compose.animation.core.animateDpAsState import androidx.compose.runtime.* import androidx.compose.ui.platform.LocalView -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp import androidx.core.view.WindowInsetsCompat import androidx.core.view.doOnLayout - @Deprecated("Old design system. Use `:ivy-design` and Material3") fun View.showKeyboard() { val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager diff --git a/templates/__module/build.gradle.kts b/templates/__module/build.gradle.kts index 90e212f88f..904b175d1c 100644 --- a/templates/__module/build.gradle.kts +++ b/templates/__module/build.gradle.kts @@ -15,4 +15,4 @@ dependencies { implementation(projects.ivyCommonUi) testImplementation(projects.ivyTesting) -} \ No newline at end of file +} diff --git a/widget-add-transaction/build.gradle.kts b/widget-add-transaction/build.gradle.kts index 4aa0052ac6..2aa5b4a800 100644 --- a/widget-add-transaction/build.gradle.kts +++ b/widget-add-transaction/build.gradle.kts @@ -12,4 +12,4 @@ dependencies { implementation(projects.ivyDomain) implementation(projects.ivyResources) implementation(projects.ivyWidgetBase) -} \ No newline at end of file +} diff --git a/widget-add-transaction/src/main/java/com/ivy/widget/transaction/AddTransactionWidgetClick.kt b/widget-add-transaction/src/main/java/com/ivy/widget/transaction/AddTransactionWidgetClick.kt index 4dbd69bf43..914d6a3efb 100644 --- a/widget-add-transaction/src/main/java/com/ivy/widget/transaction/AddTransactionWidgetClick.kt +++ b/widget-add-transaction/src/main/java/com/ivy/widget/transaction/AddTransactionWidgetClick.kt @@ -6,8 +6,8 @@ import android.content.Context import android.content.Intent import android.widget.RemoteViews import androidx.annotation.IdRes -import com.ivy.domain.AppStarter import com.ivy.base.model.TransactionType +import com.ivy.domain.AppStarter import javax.inject.Inject class AddTransactionWidgetClick @Inject constructor( diff --git a/widget-balance/build.gradle.kts b/widget-balance/build.gradle.kts index c69c2382be..0d2b4e313a 100644 --- a/widget-balance/build.gradle.kts +++ b/widget-balance/build.gradle.kts @@ -13,4 +13,4 @@ dependencies { implementation(projects.tempOldDesign) implementation(projects.ivyWidgetBase) implementation(projects.tempLegacyCode) -} \ No newline at end of file +} diff --git a/widget-balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidget.kt b/widget-balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidget.kt index eb3918b306..22dc5ddfe1 100644 --- a/widget-balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidget.kt +++ b/widget-balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidget.kt @@ -14,10 +14,10 @@ import androidx.glance.appwidget.provideContent import androidx.glance.appwidget.state.updateAppWidgetState import androidx.glance.currentState import androidx.glance.state.PreferencesGlanceStateDefinition +import com.ivy.base.model.TransactionType import com.ivy.domain.AppStarter import com.ivy.legacy.data.SharedPrefs import com.ivy.legacy.data.model.toCloseTimeRange -import com.ivy.base.model.TransactionType import com.ivy.wallet.domain.action.account.AccountsAct import com.ivy.wallet.domain.action.settings.SettingsAct import com.ivy.wallet.domain.action.wallet.CalcIncomeExpenseAct