Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

seminar 3 #4

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.0'
}

android {
Expand Down Expand Up @@ -47,4 +48,10 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

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:0.8.0'
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
implementation("com.squareup.okhttp3:okhttp")
}
20 changes: 17 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />
<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
Expand All @@ -10,7 +10,9 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/Theme.GOSOPTAndroid"
tools:targetApi="31">
tools:targetApi="31"
android:usesCleartextTraffic="true"
>
<activity android:name=".external.MainActivity"
android:exported="true">
<intent-filter>
Expand All @@ -28,9 +30,21 @@
</activity>
<activity
android:name=".external.SignUpActivity"
android:exported="false">
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:name=".external.SignInActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
70 changes: 70 additions & 0 deletions app/src/main/java/org/android/go/sopt/external/ApiPool.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package org.android.go.sopt.external

import kotlinx.serialization.Serializable
import retrofit2.Call
import retrofit2.http.Body
import retrofit2.http.POST

object ApiPool {
val signUpService: SignUpService =
PreparedRetrofit.apiServerRetrofitForAnonymous.create(SignUpService::class.java)
val signInService: SignInService =
PreparedRetrofit.apiServerRetrofitForAnonymous.create(SignInService::class.java)
}

interface SignUpService {
@POST("/sign-up")
fun signUp(
@Body request: Request
): Call<Response>

@Serializable
data class Request(
val id: String,
val password: String,
val name: String,
val skill: String?
)

@Serializable
data class Response(
val status: Int,
val message: String,
val data: Data?,
) {

@Serializable
data class Data(
val name: String,
val skill: String?
)
}
}

interface SignInService {
@POST("/sign-in")
fun signIn(
@Body request: Request
): Call<Response>

@Serializable
data class Request(
val id: String,
val password: String
)

@Serializable
data class Response(
val status: Int,
val message: String,
val data: Data?,
) {

@Serializable
data class Data(
val id: String,
val name: String,
val skill: String?
)
}
}
25 changes: 25 additions & 0 deletions app/src/main/java/org/android/go/sopt/external/PreparedRetrofit.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package org.android.go.sopt.external

import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
import kotlinx.serialization.json.Json
import okhttp3.MediaType
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import retrofit2.Retrofit
import java.util.concurrent.TimeUnit

object PreparedRetrofit {
val apiServerRetrofitForAnonymous by lazy {
Retrofit.Builder()
.baseUrl("http://52.78.152.187:8080")
.client(
OkHttpClient.Builder().apply {
connectTimeout(10, TimeUnit.SECONDS)
writeTimeout(5, TimeUnit.SECONDS)
readTimeout(5, TimeUnit.SECONDS)
}.build()
)
.addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
.build()
}
}
55 changes: 55 additions & 0 deletions app/src/main/java/org/android/go/sopt/external/SignInActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package org.android.go.sopt.external

import android.content.Intent
import android.os.Bundle
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import org.android.go.sopt.databinding.ActivitySignInBinding
import org.android.go.sopt.toast
import retrofit2.Call
import retrofit2.Response

class SignInActivity : AppCompatActivity() {
private lateinit var binding: ActivitySignInBinding

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivitySignInBinding.inflate(layoutInflater)
setContentView(binding.root)

onClick()
}

private fun onClick() {
btnSignIn()
}

private fun btnSignIn() {
binding.btnSignIn.setOnClickListener {
if(binding.tvSignInId.text.isNotBlank() && binding.tvSignInPw.text.isNotBlank()) {
val id = binding.tvSignInId.text.toString()
val pw = binding.tvSignInPw.text.toString()

ApiPool.signInService.signIn(SignInService.Request(id = id, password = pw)).enqueue(object : retrofit2.Callback<SignInService.Response> {
override fun onResponse(
call: Call<SignInService.Response>,
response: Response<SignInService.Response>
) {
if(response.isSuccessful) {
Toast.makeText(this@SignInActivity, "로그인이 정상적으로 이루어졌습니다.", Toast.LENGTH_SHORT).show()

toast("안녕하세요! ${response.body()?.data?.name}")

} else {
Toast.makeText(this@SignInActivity, "로그인이 정상적으로 처리되지 않았습니다.", Toast.LENGTH_SHORT).show()
}
}

override fun onFailure(call: Call<SignInService.Response>, t: Throwable) {
Toast.makeText(this@SignInActivity, "네트워크 통신이 원활하지 못합니다.", Toast.LENGTH_SHORT).show()
}
})
}
}
}
}
55 changes: 42 additions & 13 deletions app/src/main/java/org/android/go/sopt/external/SignUpActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ package org.android.go.sopt.external

import android.content.Intent
import android.os.Bundle
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import org.android.go.sopt.databinding.ActivitySignUpBinding
import org.android.go.sopt.get
import org.android.go.sopt.idSucceed
import org.android.go.sopt.internal.signup.SignUpUser
import org.android.go.sopt.pwSucceed
import org.android.go.sopt.toast
import retrofit2.Call
import retrofit2.Response

class SignUpActivity : AppCompatActivity() {
private lateinit var binding: ActivitySignUpBinding
Expand All @@ -28,19 +31,45 @@ class SignUpActivity : AppCompatActivity() {
private fun btnSignIn() {
binding.btnSignUp.setOnClickListener {
if (binding.idSucceed() && binding.pwSucceed()) {
val toProfile = Intent(this@SignUpActivity, ProfileActivity::class.java)
toProfile.putExtra(
SIGN_UP_USER,
SignUpUser(
id = binding.etId.get(),
password = binding.etPw.get(),
name = binding.etName.get(),
hobby = binding.etHobby.get()
)
)
toast("안녕하세요!")
startActivity(toProfile)
finish()

ApiPool.signUpService.signUp(SignUpService.Request(
id = binding.etId.get(),
password = binding.etPw.get(),
name = binding.etName.get(),
skill = binding.etHobby.get()
)).enqueue(object : retrofit2.Callback<SignUpService.Response> {
override fun onResponse(
call: Call<SignUpService.Response>,
response: Response<SignUpService.Response>
) {
if(response.isSuccessful) {
Toast.makeText(this@SignUpActivity, "회원가입이 정상적으로 이루어졌습니다.", Toast.LENGTH_SHORT).show()

val toProfile = Intent(this@SignUpActivity, ProfileActivity::class.java)
toProfile.putExtra(
SIGN_UP_USER,
SignUpUser(
id = binding.etId.get(),
password = binding.etPw.get(),
name = binding.etName.get(),
hobby = binding.etHobby.get()
)
)
toast("안녕하세요!")
startActivity(toProfile)
finish()

} else {
Toast.makeText(this@SignUpActivity, "회원가입이 정상적으로 처리되지 않았습니다.", Toast.LENGTH_SHORT).show()
}
}

override fun onFailure(call: Call<SignUpService.Response>, t: Throwable) {
Toast.makeText(this@SignUpActivity, "네트워크 통신이 원활하지 못합니다.", Toast.LENGTH_SHORT).show()
}
})


} else {
toast("id 혹은 password 가 정상적으로 입력되지 않았습니다.")
}
Expand Down
46 changes: 46 additions & 0 deletions app/src/main/res/layout/activity_sign_in.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">

<EditText
android:id="@+id/tv_sign_in_id"
android:layout_width="0dp"
android:layout_height="wrap_content"

android:hint="아이디를 입력하쇼."
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@id/tv_sign_in_pw"
app:layout_constraintEnd_toEndOf="parent"

app:layout_constraintStart_toStartOf="parent"

app:layout_constraintTop_toTopOf="parent" />

<EditText
android:id="@+id/tv_sign_in_pw"
android:layout_width="0dp"
android:layout_height="wrap_content"

android:hint="비밀번호를 입력하쇼."
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@id/btn_sign_in"
app:layout_constraintEnd_toEndOf="parent"

app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_sign_in_id" />

<Button
android:id="@+id/btn_sign_in"
android:layout_width="0dp"
android:layout_height="wrap_content"

app:layout_constraintTop_toBottomOf="@id/tv_sign_in_pw"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"

android:text="로그인 하쇼."
/>
</androidx.constraintlayout.widget.ConstraintLayout>