From a96f7f0238807f701bf502337d26c8d0f6a4ccfc Mon Sep 17 00:00:00 2001 From: SYAAINN Date: Fri, 3 May 2024 23:30:04 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EC=84=9C=EB=B2=84=20=ED=86=B5?= =?UTF-8?q?=EC=8B=A0=20=EA=B8=B0=EC=B4=88=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 17 +++++++++++++ app/src/main/AndroidManifest.xml | 3 +++ .../java/com/sopt/now/compose/ApiFactory.kt | 25 +++++++++++++++++++ .../java/com/sopt/now/compose/AuthService.kt | 24 ++++++++++++++++++ .../com/sopt/now/compose/RequestSignInDto.kt | 12 +++++++++ .../com/sopt/now/compose/RequestSignUpDto.kt | 16 ++++++++++++ .../com/sopt/now/compose/ResponseSignInDto.kt | 12 +++++++++ .../com/sopt/now/compose/ResponseSignUpDto.kt | 12 +++++++++ .../sopt/now/compose/ResponseUserInfoDto.kt | 23 +++++++++++++++++ 9 files changed, 144 insertions(+) create mode 100644 app/src/main/java/com/sopt/now/compose/ApiFactory.kt create mode 100644 app/src/main/java/com/sopt/now/compose/AuthService.kt create mode 100644 app/src/main/java/com/sopt/now/compose/RequestSignInDto.kt create mode 100644 app/src/main/java/com/sopt/now/compose/RequestSignUpDto.kt create mode 100644 app/src/main/java/com/sopt/now/compose/ResponseSignInDto.kt create mode 100644 app/src/main/java/com/sopt/now/compose/ResponseSignUpDto.kt create mode 100644 app/src/main/java/com/sopt/now/compose/ResponseUserInfoDto.kt diff --git a/app/build.gradle b/app/build.gradle index 35c39c6..a5a2639 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,12 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0' } +Properties properties = new Properties() +properties.load(project.rootProject.file('local.properties').newDataInputStream()) + android { namespace 'com.sopt.now.compose' compileSdk 34 @@ -18,6 +22,7 @@ android { vectorDrawables { useSupportLibrary true } + buildConfigField "String", "AUTH_BASE_URL", properties["base.url"] } buildTypes { @@ -35,6 +40,7 @@ android { } buildFeatures { compose true + buildConfig true } composeOptions { kotlinCompilerExtensionVersion '1.5.1' @@ -64,4 +70,15 @@ dependencies { androidTestImplementation 'androidx.compose.ui:ui-test-junit4' debugImplementation 'androidx.compose.ui:ui-tooling' debugImplementation 'androidx.compose.ui:ui-test-manifest' + + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1' + implementation 'com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0' + +// define a BOM and its version + implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0")) + +// define any required OkHttp artifacts without version + implementation("com.squareup.okhttp3:okhttp") + implementation("com.squareup.okhttp3:logging-interceptor") } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a9fa545..0d0f9bb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + create(): T = retrofit.create(T::class.java) +} + +object ServicePool { + val authService = ApiFactory.create() + val userService = ApiFactory.create() +} \ No newline at end of file diff --git a/app/src/main/java/com/sopt/now/compose/AuthService.kt b/app/src/main/java/com/sopt/now/compose/AuthService.kt new file mode 100644 index 0000000..5fc3d13 --- /dev/null +++ b/app/src/main/java/com/sopt/now/compose/AuthService.kt @@ -0,0 +1,24 @@ +package com.sopt.now.compose + +import retrofit2.Call +import retrofit2.http.Body +import retrofit2.http.GET +import retrofit2.http.Header +import retrofit2.http.POST + +interface AuthService { + @POST("member/join") //http 메소드 + fun signUp( + @Body request: RequestSignUpDto + ): Call //비동기->callback + + @POST("member/login") + fun signIn( + @Body request : RequestSignInDto + ) : Call + + @GET("/member/info") + fun getUserInfo( + @Header("memberId") userId : Int + ) : Call +} \ No newline at end of file diff --git a/app/src/main/java/com/sopt/now/compose/RequestSignInDto.kt b/app/src/main/java/com/sopt/now/compose/RequestSignInDto.kt new file mode 100644 index 0000000..35e1da5 --- /dev/null +++ b/app/src/main/java/com/sopt/now/compose/RequestSignInDto.kt @@ -0,0 +1,12 @@ +package com.sopt.now.compose + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class RequestSignInDto( + @SerialName("authenticationId") + val authenticationId: String, + @SerialName("password") + val password: String +) \ No newline at end of file diff --git a/app/src/main/java/com/sopt/now/compose/RequestSignUpDto.kt b/app/src/main/java/com/sopt/now/compose/RequestSignUpDto.kt new file mode 100644 index 0000000..bf94279 --- /dev/null +++ b/app/src/main/java/com/sopt/now/compose/RequestSignUpDto.kt @@ -0,0 +1,16 @@ +package com.sopt.now.compose + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class RequestSignUpDto( + @SerialName("authenticationId") + val authenticationId: String, + @SerialName("password") + val password: String, + @SerialName("nickname") + val nickname: String, + @SerialName("phone") + val phone: String, +) \ No newline at end of file diff --git a/app/src/main/java/com/sopt/now/compose/ResponseSignInDto.kt b/app/src/main/java/com/sopt/now/compose/ResponseSignInDto.kt new file mode 100644 index 0000000..7fa706c --- /dev/null +++ b/app/src/main/java/com/sopt/now/compose/ResponseSignInDto.kt @@ -0,0 +1,12 @@ +package com.sopt.now.compose + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class ResponseSignInDto( + @SerialName("code") + val code: Int, + @SerialName("message") + val message: String +) \ No newline at end of file diff --git a/app/src/main/java/com/sopt/now/compose/ResponseSignUpDto.kt b/app/src/main/java/com/sopt/now/compose/ResponseSignUpDto.kt new file mode 100644 index 0000000..52e85ab --- /dev/null +++ b/app/src/main/java/com/sopt/now/compose/ResponseSignUpDto.kt @@ -0,0 +1,12 @@ +package com.sopt.now.compose + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class ResponseSignUpDto( + @SerialName("code") + val code: Int, + @SerialName("message") + val message: String +) \ No newline at end of file diff --git a/app/src/main/java/com/sopt/now/compose/ResponseUserInfoDto.kt b/app/src/main/java/com/sopt/now/compose/ResponseUserInfoDto.kt new file mode 100644 index 0000000..a6f895b --- /dev/null +++ b/app/src/main/java/com/sopt/now/compose/ResponseUserInfoDto.kt @@ -0,0 +1,23 @@ +package com.sopt.now.compose + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class ResponseUserInfoDto ( + @SerialName("code") + val code: Int, + @SerialName("message") + val message: String, + @SerialName("data") + val data : UserInfo +) +@Serializable +data class UserInfo ( + @SerialName("authenticationId") + val authenticationId: String, + @SerialName("nickname") + val nickname: String, + @SerialName("phone") + val phone: String +) \ No newline at end of file From 33d5f36b022e8fbae4fc9018eff1d1177d5676cb Mon Sep 17 00:00:00 2001 From: SYAAINN Date: Fri, 3 May 2024 23:35:56 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=ED=8C=8C=EC=9D=BC=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=ED=8C=A8=ED=82=A4=EC=A7=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/com/sopt/now/compose/ApiFactory.kt | 2 +- app/src/main/java/com/sopt/now/compose/Scaffold.kt | 6 +++--- .../java/com/sopt/now/compose/{ => main}/MainActivity.kt | 5 ++++- .../com/sopt/now/compose/{ => main}/home/HomeScreen.kt | 3 +-- .../com/sopt/now/compose/{ => main}/home/HomeViewModel.kt | 2 +- .../java/com/sopt/now/compose/{ => main}/home/Profiles.kt | 2 +- .../com/sopt/now/compose/{ => main}/mypage/MyPageScreen.kt | 2 +- .../com/sopt/now/compose/{ => main}/search/SearchScreen.kt | 2 +- .../com/sopt/now/compose/{ => request}/RequestSignInDto.kt | 2 +- .../com/sopt/now/compose/{ => request}/RequestSignUpDto.kt | 2 +- .../sopt/now/compose/{ => response}/ResponseSignInDto.kt | 2 +- .../sopt/now/compose/{ => response}/ResponseSignUpDto.kt | 2 +- .../sopt/now/compose/{ => response}/ResponseUserInfoDto.kt | 2 +- .../java/com/sopt/now/compose/{ => service}/AuthService.kt | 7 ++++++- .../java/com/sopt/now/compose/{ => signIn}/SignInScreen.kt | 5 ++++- .../java/com/sopt/now/compose/{ => signUp}/SignUpScreen.kt | 5 ++++- 17 files changed, 33 insertions(+), 20 deletions(-) rename app/src/main/java/com/sopt/now/compose/{ => main}/MainActivity.kt (91%) rename app/src/main/java/com/sopt/now/compose/{ => main}/home/HomeScreen.kt (89%) rename app/src/main/java/com/sopt/now/compose/{ => main}/home/HomeViewModel.kt (98%) rename app/src/main/java/com/sopt/now/compose/{ => main}/home/Profiles.kt (98%) rename app/src/main/java/com/sopt/now/compose/{ => main}/mypage/MyPageScreen.kt (97%) rename app/src/main/java/com/sopt/now/compose/{ => main}/search/SearchScreen.kt (89%) rename app/src/main/java/com/sopt/now/compose/{ => request}/RequestSignInDto.kt (87%) rename app/src/main/java/com/sopt/now/compose/{ => request}/RequestSignUpDto.kt (90%) rename app/src/main/java/com/sopt/now/compose/{ => response}/ResponseSignInDto.kt (85%) rename app/src/main/java/com/sopt/now/compose/{ => response}/ResponseSignUpDto.kt (85%) rename app/src/main/java/com/sopt/now/compose/{ => response}/ResponseUserInfoDto.kt (92%) rename app/src/main/java/com/sopt/now/compose/{ => service}/AuthService.kt (63%) rename app/src/main/java/com/sopt/now/compose/{ => signIn}/SignInScreen.kt (96%) rename app/src/main/java/com/sopt/now/compose/{ => signUp}/SignUpScreen.kt (97%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0d0f9bb..752f031 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ android:usesCleartextTraffic="true" tools:targetApi="31"> diff --git a/app/src/main/java/com/sopt/now/compose/ApiFactory.kt b/app/src/main/java/com/sopt/now/compose/ApiFactory.kt index f51267b..471d5fa 100644 --- a/app/src/main/java/com/sopt/now/compose/ApiFactory.kt +++ b/app/src/main/java/com/sopt/now/compose/ApiFactory.kt @@ -2,6 +2,7 @@ package com.sopt.now.compose import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import com.sopt.now.BuildConfig +import com.sopt.now.compose.service.AuthService import kotlinx.serialization.json.Json import okhttp3.MediaType.Companion.toMediaType import retrofit2.Retrofit @@ -21,5 +22,4 @@ object ApiFactory { object ServicePool { val authService = ApiFactory.create() - val userService = ApiFactory.create() } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/now/compose/Scaffold.kt b/app/src/main/java/com/sopt/now/compose/Scaffold.kt index 61a3768..becd741 100644 --- a/app/src/main/java/com/sopt/now/compose/Scaffold.kt +++ b/app/src/main/java/com/sopt/now/compose/Scaffold.kt @@ -26,9 +26,9 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp -import com.sopt.now.compose.home.HomeScreen -import com.sopt.now.compose.mypage.MyPageScreen -import com.sopt.now.compose.search.SearchScreen +import com.sopt.now.compose.main.home.HomeScreen +import com.sopt.now.compose.main.mypage.MyPageScreen +import com.sopt.now.compose.main.search.SearchScreen data class BottomNavigationItem( val icon: ImageVector, diff --git a/app/src/main/java/com/sopt/now/compose/MainActivity.kt b/app/src/main/java/com/sopt/now/compose/main/MainActivity.kt similarity index 91% rename from app/src/main/java/com/sopt/now/compose/MainActivity.kt rename to app/src/main/java/com/sopt/now/compose/main/MainActivity.kt index dfe4a86..21ac519 100644 --- a/app/src/main/java/com/sopt/now/compose/MainActivity.kt +++ b/app/src/main/java/com/sopt/now/compose/main/MainActivity.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose +package com.sopt.now.compose.main import android.os.Bundle import androidx.activity.ComponentActivity @@ -6,6 +6,9 @@ import androidx.activity.compose.setContent import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController +import com.sopt.now.compose.Scaffold +import com.sopt.now.compose.signIn.SignInScreen +import com.sopt.now.compose.signUp.SignUpScreen class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/sopt/now/compose/home/HomeScreen.kt b/app/src/main/java/com/sopt/now/compose/main/home/HomeScreen.kt similarity index 89% rename from app/src/main/java/com/sopt/now/compose/home/HomeScreen.kt rename to app/src/main/java/com/sopt/now/compose/main/home/HomeScreen.kt index 0a1bb58..c7a4e0b 100644 --- a/app/src/main/java/com/sopt/now/compose/home/HomeScreen.kt +++ b/app/src/main/java/com/sopt/now/compose/main/home/HomeScreen.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose.home +package com.sopt.now.compose.main.home import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.lazy.LazyColumn @@ -6,7 +6,6 @@ import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview -import com.sopt.now.compose.R @Preview @Composable diff --git a/app/src/main/java/com/sopt/now/compose/home/HomeViewModel.kt b/app/src/main/java/com/sopt/now/compose/main/home/HomeViewModel.kt similarity index 98% rename from app/src/main/java/com/sopt/now/compose/home/HomeViewModel.kt rename to app/src/main/java/com/sopt/now/compose/main/home/HomeViewModel.kt index 48bd991..512fec9 100644 --- a/app/src/main/java/com/sopt/now/compose/home/HomeViewModel.kt +++ b/app/src/main/java/com/sopt/now/compose/main/home/HomeViewModel.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose.home +package com.sopt.now.compose.main.home import com.sopt.now.compose.R diff --git a/app/src/main/java/com/sopt/now/compose/home/Profiles.kt b/app/src/main/java/com/sopt/now/compose/main/home/Profiles.kt similarity index 98% rename from app/src/main/java/com/sopt/now/compose/home/Profiles.kt rename to app/src/main/java/com/sopt/now/compose/main/home/Profiles.kt index fb1423f..2ec11f0 100644 --- a/app/src/main/java/com/sopt/now/compose/home/Profiles.kt +++ b/app/src/main/java/com/sopt/now/compose/main/home/Profiles.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose.home +package com.sopt.now.compose.main.home import androidx.annotation.DrawableRes import androidx.compose.foundation.Image diff --git a/app/src/main/java/com/sopt/now/compose/mypage/MyPageScreen.kt b/app/src/main/java/com/sopt/now/compose/main/mypage/MyPageScreen.kt similarity index 97% rename from app/src/main/java/com/sopt/now/compose/mypage/MyPageScreen.kt rename to app/src/main/java/com/sopt/now/compose/main/mypage/MyPageScreen.kt index 3f10be9..7a6a6a6 100644 --- a/app/src/main/java/com/sopt/now/compose/mypage/MyPageScreen.kt +++ b/app/src/main/java/com/sopt/now/compose/main/mypage/MyPageScreen.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose.mypage +package com.sopt.now.compose.main.mypage import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/sopt/now/compose/search/SearchScreen.kt b/app/src/main/java/com/sopt/now/compose/main/search/SearchScreen.kt similarity index 89% rename from app/src/main/java/com/sopt/now/compose/search/SearchScreen.kt rename to app/src/main/java/com/sopt/now/compose/main/search/SearchScreen.kt index d5d130b..35af8ea 100644 --- a/app/src/main/java/com/sopt/now/compose/search/SearchScreen.kt +++ b/app/src/main/java/com/sopt/now/compose/main/search/SearchScreen.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose.search +package com.sopt.now.compose.main.search import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize diff --git a/app/src/main/java/com/sopt/now/compose/RequestSignInDto.kt b/app/src/main/java/com/sopt/now/compose/request/RequestSignInDto.kt similarity index 87% rename from app/src/main/java/com/sopt/now/compose/RequestSignInDto.kt rename to app/src/main/java/com/sopt/now/compose/request/RequestSignInDto.kt index 35e1da5..4a5e56e 100644 --- a/app/src/main/java/com/sopt/now/compose/RequestSignInDto.kt +++ b/app/src/main/java/com/sopt/now/compose/request/RequestSignInDto.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose +package com.sopt.now.compose.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/sopt/now/compose/RequestSignUpDto.kt b/app/src/main/java/com/sopt/now/compose/request/RequestSignUpDto.kt similarity index 90% rename from app/src/main/java/com/sopt/now/compose/RequestSignUpDto.kt rename to app/src/main/java/com/sopt/now/compose/request/RequestSignUpDto.kt index bf94279..bc2701c 100644 --- a/app/src/main/java/com/sopt/now/compose/RequestSignUpDto.kt +++ b/app/src/main/java/com/sopt/now/compose/request/RequestSignUpDto.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose +package com.sopt.now.compose.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/sopt/now/compose/ResponseSignInDto.kt b/app/src/main/java/com/sopt/now/compose/response/ResponseSignInDto.kt similarity index 85% rename from app/src/main/java/com/sopt/now/compose/ResponseSignInDto.kt rename to app/src/main/java/com/sopt/now/compose/response/ResponseSignInDto.kt index 7fa706c..de6e6ac 100644 --- a/app/src/main/java/com/sopt/now/compose/ResponseSignInDto.kt +++ b/app/src/main/java/com/sopt/now/compose/response/ResponseSignInDto.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose +package com.sopt.now.compose.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/sopt/now/compose/ResponseSignUpDto.kt b/app/src/main/java/com/sopt/now/compose/response/ResponseSignUpDto.kt similarity index 85% rename from app/src/main/java/com/sopt/now/compose/ResponseSignUpDto.kt rename to app/src/main/java/com/sopt/now/compose/response/ResponseSignUpDto.kt index 52e85ab..1b47252 100644 --- a/app/src/main/java/com/sopt/now/compose/ResponseSignUpDto.kt +++ b/app/src/main/java/com/sopt/now/compose/response/ResponseSignUpDto.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose +package com.sopt.now.compose.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/sopt/now/compose/ResponseUserInfoDto.kt b/app/src/main/java/com/sopt/now/compose/response/ResponseUserInfoDto.kt similarity index 92% rename from app/src/main/java/com/sopt/now/compose/ResponseUserInfoDto.kt rename to app/src/main/java/com/sopt/now/compose/response/ResponseUserInfoDto.kt index a6f895b..90ea0d3 100644 --- a/app/src/main/java/com/sopt/now/compose/ResponseUserInfoDto.kt +++ b/app/src/main/java/com/sopt/now/compose/response/ResponseUserInfoDto.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose +package com.sopt.now.compose.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/sopt/now/compose/AuthService.kt b/app/src/main/java/com/sopt/now/compose/service/AuthService.kt similarity index 63% rename from app/src/main/java/com/sopt/now/compose/AuthService.kt rename to app/src/main/java/com/sopt/now/compose/service/AuthService.kt index 5fc3d13..6ff75cd 100644 --- a/app/src/main/java/com/sopt/now/compose/AuthService.kt +++ b/app/src/main/java/com/sopt/now/compose/service/AuthService.kt @@ -1,5 +1,10 @@ -package com.sopt.now.compose +package com.sopt.now.compose.service +import com.sopt.now.compose.request.RequestSignInDto +import com.sopt.now.compose.request.RequestSignUpDto +import com.sopt.now.compose.response.ResponseSignInDto +import com.sopt.now.compose.response.ResponseSignUpDto +import com.sopt.now.compose.response.ResponseUserInfoDto import retrofit2.Call import retrofit2.http.Body import retrofit2.http.GET diff --git a/app/src/main/java/com/sopt/now/compose/SignInScreen.kt b/app/src/main/java/com/sopt/now/compose/signIn/SignInScreen.kt similarity index 96% rename from app/src/main/java/com/sopt/now/compose/SignInScreen.kt rename to app/src/main/java/com/sopt/now/compose/signIn/SignInScreen.kt index 2046067..354d654 100644 --- a/app/src/main/java/com/sopt/now/compose/SignInScreen.kt +++ b/app/src/main/java/com/sopt/now/compose/signIn/SignInScreen.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose +package com.sopt.now.compose.signIn import android.content.Context import androidx.compose.foundation.layout.Arrangement @@ -29,6 +29,9 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController +import com.sopt.now.compose.R +import com.sopt.now.compose.SOPTOutlinedButton +import com.sopt.now.compose.showToast @Composable fun SignInScreen( diff --git a/app/src/main/java/com/sopt/now/compose/SignUpScreen.kt b/app/src/main/java/com/sopt/now/compose/signUp/SignUpScreen.kt similarity index 97% rename from app/src/main/java/com/sopt/now/compose/SignUpScreen.kt rename to app/src/main/java/com/sopt/now/compose/signUp/SignUpScreen.kt index eadc16d..61409bb 100644 --- a/app/src/main/java/com/sopt/now/compose/SignUpScreen.kt +++ b/app/src/main/java/com/sopt/now/compose/signUp/SignUpScreen.kt @@ -1,4 +1,4 @@ -package com.sopt.now.compose +package com.sopt.now.compose.signUp import android.content.Context import androidx.compose.foundation.layout.Arrangement @@ -31,6 +31,9 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController +import com.sopt.now.compose.R +import com.sopt.now.compose.SOPTOutlinedButton +import com.sopt.now.compose.showToast @Composable fun SignUpScreen(navController: NavController) {