From 01dbcbcc4abeffd4c10542c2b19e0cd9b9e6c949 Mon Sep 17 00:00:00 2001 From: "Z. Charles Dziura" Date: Thu, 22 Aug 2024 08:52:41 -0400 Subject: [PATCH] Rename to 'patchwork software' --- app/app/build.gradle.kts | 8 ++++++-- .../debtpirate/ExampleInstrumentedTest.kt | 10 ++++------ .../repositories/users/UsersRemoteDataSource.kt | 3 --- .../screens/auth/usecases/RegisterNewAccountUseCase.kt | 4 ---- .../debtpirate/MainActivity.kt | 8 ++++---- .../repositories/users/UsersRemoteDataSource.kt | 3 +++ .../debtpirate/repositories/users/UsersRepository.kt | 2 +- .../debtpirate/screens/auth/AuthScreen.kt | 4 ++-- .../debtpirate/screens/auth/AuthScreenViewModel.kt | 2 +- .../debtpirate/screens/auth/SignInScreen.kt | 4 ++-- .../debtpirate/screens/auth/SignUpScreen.kt | 4 ++-- .../screens/auth/usecases/RegisterNewAccountUseCase.kt | 3 +++ .../debtpirate/types/Either.kt | 2 +- .../debtpirate/ui/theme/Color.kt | 2 +- .../debtpirate/ui/theme/Theme.kt | 3 +-- .../debtpirate/ui/theme/Type.kt | 2 +- .../debtpirate/ExampleUnitTest.kt | 5 ++--- 17 files changed, 34 insertions(+), 35 deletions(-) rename app/app/src/androidTest/java/software/{makeshift => patchwork}/debtpirate/ExampleInstrumentedTest.kt (80%) delete mode 100644 app/app/src/main/java/software/makeshift/debtpirate/repositories/users/UsersRemoteDataSource.kt delete mode 100644 app/app/src/main/java/software/makeshift/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt rename app/app/src/main/java/software/{makeshift => patchwork}/debtpirate/MainActivity.kt (82%) create mode 100644 app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRemoteDataSource.kt rename app/app/src/main/java/software/{makeshift => patchwork}/debtpirate/repositories/users/UsersRepository.kt (81%) rename app/app/src/main/java/software/{makeshift => patchwork}/debtpirate/screens/auth/AuthScreen.kt (96%) rename app/app/src/main/java/software/{makeshift => patchwork}/debtpirate/screens/auth/AuthScreenViewModel.kt (91%) rename app/app/src/main/java/software/{makeshift => patchwork}/debtpirate/screens/auth/SignInScreen.kt (98%) rename app/app/src/main/java/software/{makeshift => patchwork}/debtpirate/screens/auth/SignUpScreen.kt (97%) create mode 100644 app/app/src/main/java/software/patchwork/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt rename app/app/src/main/java/software/{makeshift => patchwork}/debtpirate/types/Either.kt (76%) rename app/app/src/main/java/software/{makeshift => patchwork}/debtpirate/ui/theme/Color.kt (73%) rename app/app/src/main/java/software/{makeshift => patchwork}/debtpirate/ui/theme/Theme.kt (95%) rename app/app/src/main/java/software/{makeshift => patchwork}/debtpirate/ui/theme/Type.kt (95%) rename app/app/src/test/java/software/{makeshift => patchwork}/debtpirate/ExampleUnitTest.kt (79%) diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts index f35f657..d41f3e7 100644 --- a/app/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -6,11 +6,11 @@ plugins { } android { - namespace = "software.makeshift.debtpirate" + namespace = "software.patchwork.debtpirate" compileSdk = 34 defaultConfig { - applicationId = "software.makeshift.debtpirate" + applicationId = "software.patchwork.debtpirate" minSdk = 33 targetSdk = 35 versionCode = 1 @@ -30,6 +30,9 @@ android { "proguard-rules.pro" ) } + debug { + buildConfigField("String", "API_BASE_URL", "\"http://localhost:42069\"") + } } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 @@ -40,6 +43,7 @@ android { } buildFeatures { compose = true + buildConfig = true } composeOptions { kotlinCompilerExtensionVersion = "1.5.1" diff --git a/app/app/src/androidTest/java/software/makeshift/debtpirate/ExampleInstrumentedTest.kt b/app/app/src/androidTest/java/software/patchwork/debtpirate/ExampleInstrumentedTest.kt similarity index 80% rename from app/app/src/androidTest/java/software/makeshift/debtpirate/ExampleInstrumentedTest.kt rename to app/app/src/androidTest/java/software/patchwork/debtpirate/ExampleInstrumentedTest.kt index f8790a1..7b3edf2 100644 --- a/app/app/src/androidTest/java/software/makeshift/debtpirate/ExampleInstrumentedTest.kt +++ b/app/app/src/androidTest/java/software/patchwork/debtpirate/ExampleInstrumentedTest.kt @@ -1,13 +1,11 @@ -package software.makeshift.debtpirate +package software.patchwork.debtpirate -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * @@ -19,6 +17,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("software.makeshift.debtpirate", appContext.packageName) + assertEquals("software.patchwork.debtpirate", appContext.packageName) } } diff --git a/app/app/src/main/java/software/makeshift/debtpirate/repositories/users/UsersRemoteDataSource.kt b/app/app/src/main/java/software/makeshift/debtpirate/repositories/users/UsersRemoteDataSource.kt deleted file mode 100644 index bea9300..0000000 --- a/app/app/src/main/java/software/makeshift/debtpirate/repositories/users/UsersRemoteDataSource.kt +++ /dev/null @@ -1,3 +0,0 @@ -package software.makeshift.debtpirate.repositories.users - -class UsersRemoteDataSource \ No newline at end of file diff --git a/app/app/src/main/java/software/makeshift/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt b/app/app/src/main/java/software/makeshift/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt deleted file mode 100644 index 762fe17..0000000 --- a/app/app/src/main/java/software/makeshift/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt +++ /dev/null @@ -1,4 +0,0 @@ -package software.makeshift.debtpirate.screens.auth.usecases - -class RegisterNewAccountUseCase { -} \ No newline at end of file diff --git a/app/app/src/main/java/software/makeshift/debtpirate/MainActivity.kt b/app/app/src/main/java/software/patchwork/debtpirate/MainActivity.kt similarity index 82% rename from app/app/src/main/java/software/makeshift/debtpirate/MainActivity.kt rename to app/app/src/main/java/software/patchwork/debtpirate/MainActivity.kt index d907b4e..6d23c38 100644 --- a/app/app/src/main/java/software/makeshift/debtpirate/MainActivity.kt +++ b/app/app/src/main/java/software/patchwork/debtpirate/MainActivity.kt @@ -1,4 +1,4 @@ -package software.makeshift.debtpirate +package software.patchwork.debtpirate import android.os.Bundle import androidx.activity.ComponentActivity @@ -9,9 +9,9 @@ import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import kotlinx.serialization.Serializable -import software.makeshift.debtpirate.screens.auth.AuthScreen -import software.makeshift.debtpirate.screens.auth.AuthScreenViewModel -import software.makeshift.debtpirate.ui.theme.DebtPirateTheme +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/software/patchwork/debtpirate/repositories/users/UsersRemoteDataSource.kt b/app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRemoteDataSource.kt new file mode 100644 index 0000000..1326635 --- /dev/null +++ b/app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRemoteDataSource.kt @@ -0,0 +1,3 @@ +package software.patchwork.debtpirate.repositories.users + +class UsersRemoteDataSource \ No newline at end of file diff --git a/app/app/src/main/java/software/makeshift/debtpirate/repositories/users/UsersRepository.kt b/app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRepository.kt similarity index 81% rename from app/app/src/main/java/software/makeshift/debtpirate/repositories/users/UsersRepository.kt rename to app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRepository.kt index 62f812d..d77182a 100644 --- a/app/app/src/main/java/software/makeshift/debtpirate/repositories/users/UsersRepository.kt +++ b/app/app/src/main/java/software/patchwork/debtpirate/repositories/users/UsersRepository.kt @@ -1,4 +1,4 @@ -package software.makeshift.debtpirate.repositories.users +package software.patchwork.debtpirate.repositories.users import kotlinx.serialization.Serializable diff --git a/app/app/src/main/java/software/makeshift/debtpirate/screens/auth/AuthScreen.kt b/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreen.kt similarity index 96% rename from app/app/src/main/java/software/makeshift/debtpirate/screens/auth/AuthScreen.kt rename to app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreen.kt index e883aaa..deddf2b 100644 --- a/app/app/src/main/java/software/makeshift/debtpirate/screens/auth/AuthScreen.kt +++ b/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreen.kt @@ -1,4 +1,4 @@ -package software.makeshift.debtpirate.screens.auth +package software.patchwork.debtpirate.screens.auth import android.annotation.SuppressLint import androidx.compose.foundation.background @@ -19,7 +19,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import software.makeshift.debtpirate.R +import software.patchwork.debtpirate.R @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") @Composable diff --git a/app/app/src/main/java/software/makeshift/debtpirate/screens/auth/AuthScreenViewModel.kt b/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreenViewModel.kt similarity index 91% rename from app/app/src/main/java/software/makeshift/debtpirate/screens/auth/AuthScreenViewModel.kt rename to app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreenViewModel.kt index dbd8796..569d0a4 100644 --- a/app/app/src/main/java/software/makeshift/debtpirate/screens/auth/AuthScreenViewModel.kt +++ b/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/AuthScreenViewModel.kt @@ -1,4 +1,4 @@ -package software.makeshift.debtpirate.screens.auth +package software.patchwork.debtpirate.screens.auth import androidx.lifecycle.ViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/app/src/main/java/software/makeshift/debtpirate/screens/auth/SignInScreen.kt b/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/SignInScreen.kt similarity index 98% rename from app/app/src/main/java/software/makeshift/debtpirate/screens/auth/SignInScreen.kt rename to app/app/src/main/java/software/patchwork/debtpirate/screens/auth/SignInScreen.kt index 2f35cee..1beb754 100644 --- a/app/app/src/main/java/software/makeshift/debtpirate/screens/auth/SignInScreen.kt +++ b/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/SignInScreen.kt @@ -1,4 +1,4 @@ -package software.makeshift.debtpirate.screens.auth +package software.patchwork.debtpirate.screens.auth import android.util.Log import androidx.compose.foundation.interaction.FocusInteraction @@ -35,7 +35,7 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.withLink import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.StateFlow -import software.makeshift.debtpirate.R +import software.patchwork.debtpirate.R @Composable internal fun SignInScreen( diff --git a/app/app/src/main/java/software/makeshift/debtpirate/screens/auth/SignUpScreen.kt b/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/SignUpScreen.kt similarity index 97% rename from app/app/src/main/java/software/makeshift/debtpirate/screens/auth/SignUpScreen.kt rename to app/app/src/main/java/software/patchwork/debtpirate/screens/auth/SignUpScreen.kt index 7c6e269..9472e26 100644 --- a/app/app/src/main/java/software/makeshift/debtpirate/screens/auth/SignUpScreen.kt +++ b/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/SignUpScreen.kt @@ -1,4 +1,4 @@ -package software.makeshift.debtpirate.screens.auth +package software.patchwork.debtpirate.screens.auth import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -22,7 +22,7 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp -import software.makeshift.debtpirate.R +import software.patchwork.debtpirate.R @Composable internal fun SignUpScreen( 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 new file mode 100644 index 0000000..e551ec4 --- /dev/null +++ b/app/app/src/main/java/software/patchwork/debtpirate/screens/auth/usecases/RegisterNewAccountUseCase.kt @@ -0,0 +1,3 @@ +package software.patchwork.debtpirate.screens.auth.usecases + +class RegisterNewAccountUseCase \ No newline at end of file diff --git a/app/app/src/main/java/software/makeshift/debtpirate/types/Either.kt b/app/app/src/main/java/software/patchwork/debtpirate/types/Either.kt similarity index 76% rename from app/app/src/main/java/software/makeshift/debtpirate/types/Either.kt rename to app/app/src/main/java/software/patchwork/debtpirate/types/Either.kt index 3bda194..327301f 100644 --- a/app/app/src/main/java/software/makeshift/debtpirate/types/Either.kt +++ b/app/app/src/main/java/software/patchwork/debtpirate/types/Either.kt @@ -1,4 +1,4 @@ -package software.makeshift.debtpirate.types +package software.patchwork.debtpirate.types sealed class Either { class Left(val value: A) : Either() diff --git a/app/app/src/main/java/software/makeshift/debtpirate/ui/theme/Color.kt b/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Color.kt similarity index 73% rename from app/app/src/main/java/software/makeshift/debtpirate/ui/theme/Color.kt rename to app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Color.kt index f4441a8..988d560 100644 --- a/app/app/src/main/java/software/makeshift/debtpirate/ui/theme/Color.kt +++ b/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package software.makeshift.debtpirate.ui.theme +package software.patchwork.debtpirate.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/app/src/main/java/software/makeshift/debtpirate/ui/theme/Theme.kt b/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Theme.kt similarity index 95% rename from app/app/src/main/java/software/makeshift/debtpirate/ui/theme/Theme.kt rename to app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Theme.kt index 8117341..b6bad73 100644 --- a/app/app/src/main/java/software/makeshift/debtpirate/ui/theme/Theme.kt +++ b/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Theme.kt @@ -1,6 +1,5 @@ -package software.makeshift.debtpirate.ui.theme +package software.patchwork.debtpirate.ui.theme -import android.app.Activity import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme diff --git a/app/app/src/main/java/software/makeshift/debtpirate/ui/theme/Type.kt b/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Type.kt similarity index 95% rename from app/app/src/main/java/software/makeshift/debtpirate/ui/theme/Type.kt rename to app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Type.kt index 74198ea..c19d223 100644 --- a/app/app/src/main/java/software/makeshift/debtpirate/ui/theme/Type.kt +++ b/app/app/src/main/java/software/patchwork/debtpirate/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package software.makeshift.debtpirate.ui.theme +package software.patchwork.debtpirate.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/app/src/test/java/software/makeshift/debtpirate/ExampleUnitTest.kt b/app/app/src/test/java/software/patchwork/debtpirate/ExampleUnitTest.kt similarity index 79% rename from app/app/src/test/java/software/makeshift/debtpirate/ExampleUnitTest.kt rename to app/app/src/test/java/software/patchwork/debtpirate/ExampleUnitTest.kt index 53ec4f3..0f047f7 100644 --- a/app/app/src/test/java/software/makeshift/debtpirate/ExampleUnitTest.kt +++ b/app/app/src/test/java/software/patchwork/debtpirate/ExampleUnitTest.kt @@ -1,9 +1,8 @@ -package software.makeshift.debtpirate +package software.patchwork.debtpirate +import org.junit.Assert.assertEquals import org.junit.Test -import org.junit.Assert.* - /** * Example local unit test, which will execute on the development machine (host). *