From 6a5bbfd2a8df7ae728e84e2e0af1b72532a31bf2 Mon Sep 17 00:00:00 2001 From: "Z. Charles Dziura" Date: Tue, 24 Sep 2024 13:53:16 -0400 Subject: [PATCH] Once again, change the app's package structure --- .../debtpirate/ExampleInstrumentedTest.kt | 2 +- app/app/src/main/AndroidManifest.xml | 2 +- .../bikeshedengineer}/debtpirate/MainActivity.kt | 8 ++++---- .../repositories/users/UsersRemoteDataSource.kt | 3 +++ .../debtpirate/repositories/users/UsersRepository.kt | 2 +- .../debtpirate/screens/auth/AuthScreen.kt | 2 +- .../debtpirate/screens/auth/AuthScreenViewModel.kt | 2 +- .../screens/auth/usecases/RegisterNewAccountUseCase.kt | 3 +++ .../bikeshedengineer}/debtpirate/types/Either.kt | 2 +- .../bikeshedengineer}/debtpirate/ui/theme/Color.kt | 2 +- .../bikeshedengineer}/debtpirate/ui/theme/Theme.kt | 2 +- .../bikeshedengineer}/debtpirate/ui/theme/Type.kt | 2 +- .../repositories/users/UsersRemoteDataSource.kt | 3 --- .../screens/auth/usecases/RegisterNewAccountUseCase.kt | 3 --- .../bikeshedengineer}/debtpirate/ExampleUnitTest.kt | 2 +- app/gradle/libs.versions.toml | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) rename app/app/src/androidTest/java/{software/patchwork => ing/bikeshedengineer}/debtpirate/ExampleInstrumentedTest.kt (94%) rename app/app/src/main/java/{software/patchwork => ing/bikeshedengineer}/debtpirate/MainActivity.kt (81%) create mode 100644 app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/users/UsersRemoteDataSource.kt rename app/app/src/main/java/{software/patchwork => ing/bikeshedengineer}/debtpirate/repositories/users/UsersRepository.kt (81%) rename app/app/src/main/java/{software/patchwork => ing/bikeshedengineer}/debtpirate/screens/auth/AuthScreen.kt (99%) rename app/app/src/main/java/{software/patchwork => ing/bikeshedengineer}/debtpirate/screens/auth/AuthScreenViewModel.kt (91%) create mode 100644 app/app/src/main/java/ing/bikeshedengineer/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt rename app/app/src/main/java/{software/patchwork => ing/bikeshedengineer}/debtpirate/types/Either.kt (75%) rename app/app/src/main/java/{software/patchwork => ing/bikeshedengineer}/debtpirate/ui/theme/Color.kt (73%) rename app/app/src/main/java/{software/patchwork => ing/bikeshedengineer}/debtpirate/ui/theme/Theme.kt (97%) rename app/app/src/main/java/{software/patchwork => ing/bikeshedengineer}/debtpirate/ui/theme/Type.kt (95%) delete mode 100644 app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRemoteDataSource.kt delete mode 100644 app/app/src/main/java/software/patchwork/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt rename app/app/src/test/java/{software/patchwork => ing/bikeshedengineer}/debtpirate/ExampleUnitTest.kt (89%) diff --git a/app/app/src/androidTest/java/software/patchwork/debtpirate/ExampleInstrumentedTest.kt b/app/app/src/androidTest/java/ing/bikeshedengineer/debtpirate/ExampleInstrumentedTest.kt similarity index 94% rename from app/app/src/androidTest/java/software/patchwork/debtpirate/ExampleInstrumentedTest.kt rename to app/app/src/androidTest/java/ing/bikeshedengineer/debtpirate/ExampleInstrumentedTest.kt index 7b3edf2..ad58388 100644 --- a/app/app/src/androidTest/java/software/patchwork/debtpirate/ExampleInstrumentedTest.kt +++ b/app/app/src/androidTest/java/ing/bikeshedengineer/debtpirate/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package software.patchwork.debtpirate +package ing.bikeshedengineer.debtpirate import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/app/app/src/main/AndroidManifest.xml b/app/app/src/main/AndroidManifest.xml index b2712bc..e69a9a5 100644 --- a/app/app/src/main/AndroidManifest.xml +++ b/app/app/src/main/AndroidManifest.xml @@ -11,7 +11,7 @@ android:supportsRtl="true" android:theme="@style/Theme.DebtPirate"> diff --git a/app/app/src/main/java/software/patchwork/debtpirate/MainActivity.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/MainActivity.kt similarity index 81% rename from app/app/src/main/java/software/patchwork/debtpirate/MainActivity.kt rename to app/app/src/main/java/ing/bikeshedengineer/debtpirate/MainActivity.kt index 6d23c38..b954337 100644 --- a/app/app/src/main/java/software/patchwork/debtpirate/MainActivity.kt +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/MainActivity.kt @@ -1,4 +1,4 @@ -package software.patchwork.debtpirate +package ing.bikeshedengineer.debtpirate import android.os.Bundle import androidx.activity.ComponentActivity @@ -8,10 +8,10 @@ import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController +import ing.bikeshedengineer.debtpirate.screens.auth.AuthScreen +import ing.bikeshedengineer.debtpirate.screens.auth.AuthScreenViewModel +import ing.bikeshedengineer.debtpirate.ui.theme.DebtPirateTheme import kotlinx.serialization.Serializable -import software.patchwork.debtpirate.screens.auth.AuthScreen -import software.patchwork.debtpirate.screens.auth.AuthScreenViewModel -import software.patchwork.debtpirate.ui.theme.DebtPirateTheme @Serializable object AuthRoute diff --git a/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/users/UsersRemoteDataSource.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/users/UsersRemoteDataSource.kt new file mode 100644 index 0000000..3412fe9 --- /dev/null +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/users/UsersRemoteDataSource.kt @@ -0,0 +1,3 @@ +package ing.bikeshedengineer.debtpirate.repositories.users + +class UsersRemoteDataSource \ No newline at end of file diff --git a/app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRepository.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/users/UsersRepository.kt similarity index 81% rename from app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRepository.kt rename to app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/users/UsersRepository.kt index d77182a..1ee7a82 100644 --- a/app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRepository.kt +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/repositories/users/UsersRepository.kt @@ -1,4 +1,4 @@ -package software.patchwork.debtpirate.repositories.users +package ing.bikeshedengineer.debtpirate.repositories.users import kotlinx.serialization.Serializable diff --git a/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreen.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/screens/auth/AuthScreen.kt similarity index 99% rename from app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreen.kt rename to app/app/src/main/java/ing/bikeshedengineer/debtpirate/screens/auth/AuthScreen.kt index ffd6350..a02faad 100644 --- a/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreen.kt +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/screens/auth/AuthScreen.kt @@ -1,4 +1,4 @@ -package software.patchwork.debtpirate.screens.auth +package ing.bikeshedengineer.debtpirate.screens.auth import android.annotation.SuppressLint import androidx.compose.foundation.background diff --git a/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreenViewModel.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/screens/auth/AuthScreenViewModel.kt similarity index 91% rename from app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreenViewModel.kt rename to app/app/src/main/java/ing/bikeshedengineer/debtpirate/screens/auth/AuthScreenViewModel.kt index 569d0a4..8d14293 100644 --- a/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreenViewModel.kt +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/screens/auth/AuthScreenViewModel.kt @@ -1,4 +1,4 @@ -package software.patchwork.debtpirate.screens.auth +package ing.bikeshedengineer.debtpirate.screens.auth import androidx.lifecycle.ViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/app/src/main/java/ing/bikeshedengineer/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt new file mode 100644 index 0000000..fe7b120 --- /dev/null +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt @@ -0,0 +1,3 @@ +package ing.bikeshedengineer.debtpirate.screens.auth.usecases + +class RegisterNewAccountUseCase \ No newline at end of file diff --git a/app/app/src/main/java/software/patchwork/debtpirate/types/Either.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/types/Either.kt similarity index 75% rename from app/app/src/main/java/software/patchwork/debtpirate/types/Either.kt rename to app/app/src/main/java/ing/bikeshedengineer/debtpirate/types/Either.kt index 327301f..6056997 100644 --- a/app/app/src/main/java/software/patchwork/debtpirate/types/Either.kt +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/types/Either.kt @@ -1,4 +1,4 @@ -package software.patchwork.debtpirate.types +package ing.bikeshedengineer.debtpirate.types sealed class Either { class Left(val value: A) : Either() diff --git a/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Color.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/ui/theme/Color.kt similarity index 73% rename from app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Color.kt rename to app/app/src/main/java/ing/bikeshedengineer/debtpirate/ui/theme/Color.kt index 988d560..a27d65d 100644 --- a/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Color.kt +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package software.patchwork.debtpirate.ui.theme +package ing.bikeshedengineer.debtpirate.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Theme.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/ui/theme/Theme.kt similarity index 97% rename from app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Theme.kt rename to app/app/src/main/java/ing/bikeshedengineer/debtpirate/ui/theme/Theme.kt index b6bad73..89872f5 100644 --- a/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Theme.kt +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package software.patchwork.debtpirate.ui.theme +package ing.bikeshedengineer.debtpirate.ui.theme import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme diff --git a/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Type.kt b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/ui/theme/Type.kt similarity index 95% rename from app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Type.kt rename to app/app/src/main/java/ing/bikeshedengineer/debtpirate/ui/theme/Type.kt index c19d223..9dfaba3 100644 --- a/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Type.kt +++ b/app/app/src/main/java/ing/bikeshedengineer/debtpirate/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package software.patchwork.debtpirate.ui.theme +package ing.bikeshedengineer.debtpirate.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRemoteDataSource.kt b/app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRemoteDataSource.kt deleted file mode 100644 index 1326635..0000000 --- a/app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRemoteDataSource.kt +++ /dev/null @@ -1,3 +0,0 @@ -package software.patchwork.debtpirate.repositories.users - -class UsersRemoteDataSource \ No newline at end of file diff --git a/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt b/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt deleted file mode 100644 index e551ec4..0000000 --- a/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt +++ /dev/null @@ -1,3 +0,0 @@ -package software.patchwork.debtpirate.screens.auth.usecases - -class RegisterNewAccountUseCase \ No newline at end of file diff --git a/app/app/src/test/java/software/patchwork/debtpirate/ExampleUnitTest.kt b/app/app/src/test/java/ing/bikeshedengineer/debtpirate/ExampleUnitTest.kt similarity index 89% rename from app/app/src/test/java/software/patchwork/debtpirate/ExampleUnitTest.kt rename to app/app/src/test/java/ing/bikeshedengineer/debtpirate/ExampleUnitTest.kt index 0f047f7..dac86c8 100644 --- a/app/app/src/test/java/software/patchwork/debtpirate/ExampleUnitTest.kt +++ b/app/app/src/test/java/ing/bikeshedengineer/debtpirate/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package software.patchwork.debtpirate +package ing.bikeshedengineer.debtpirate import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/gradle/libs.versions.toml b/app/gradle/libs.versions.toml index 69a3dc1..aad7c72 100644 --- a/app/gradle/libs.versions.toml +++ b/app/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] activityCompose = "1.9.1" -agp = "8.5.2" +agp = "8.6.0" appcompat = "1.7.0" composeBom = "2024.08.00" coreKtx = "1.13.1"