Feat/week6 essential

app/build.gradle

@@ -2,8 +2,10 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-parcelize'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.20'
 }
-
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
 android {
     namespace 'org.sopt.dosopttemplate'
     compileSdk 33
@@ -14,12 +16,14 @@ android {
         targetSdk 33
         versionCode 1
         versionName "1.0"
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField "String", "REQRES_BASE_URL", properties["reqres.base.url"]
+        buildConfigField "String", "AUTH_BASE_URL", properties["base.url"]
     }
     buildFeatures {
         viewBinding true
         dataBinding true
+        buildConfig true
     }
     buildTypes {
         release {
@@ -34,19 +38,26 @@ android {
     kotlinOptions {
         jvmTarget = '11'
     }
-
 }
 
 dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
-    implementation "androidx.fragment:fragment-ktx:1.6.1"
+    implementation "androidx.fragment:fragment-ktx:1.6.2"
     implementation "androidx.activity:activity-ktx:1.6.1"
     implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.databinding:databinding-runtime:7.1.2'
+    implementation 'androidx.databinding:databinding-runtime:8.1.4'
     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:1.0.0'
+    implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
+    implementation("com.squareup.okhttp3:okhttp")
+    implementation("com.squareup.okhttp3:logging-interceptor")
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
 }

app/src/main/AndroidManifest.xml

@@ -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"
@@ -11,26 +11,31 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.DoSoptTemplate"
-        tools:targetApi="31">
+        tools:targetApi="31"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".presentation.login.LoginActivity"
-            android:exported="false">
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize">
 
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".presentation.signup.SingUpActivity"
-            android:exported="false"></activity>
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize">
+        </activity>
         <activity
             android:name=".presentation.home.HomeActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            android:exported="false">
         </activity>
         <activity
             android:name=".presentation.editMyPage.EditMyPageActivity"
-            android:exported="false">
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize">
         </activity>
     </application>
 

app/src/main/java/org/sopt/dosopttemplate/api/APIFactory.kt

@@ -0,0 +1,49 @@
+package org.sopt.dosopttemplate.api
+
+import android.util.Log
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import kotlinx.serialization.json.Json
+import okhttp3.Interceptor
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import org.sopt.dosopttemplate.BuildConfig
+import retrofit2.Retrofit
+
+object ApiFactory {
+    lateinit var url: String
+    private fun getLogOkHttpClient(): Interceptor {
+        val loggingInterceptor = HttpLoggingInterceptor { message ->
+            Log.d("Retrofit2", "CONNECTION INFO -> $message")
+        }
+        loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
+        return loggingInterceptor
+    }
+
+    val okHttpClient = OkHttpClient.Builder()
+        .addInterceptor(getLogOkHttpClient())
+        .build()
+
+    val retrofit: Retrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl(url)
+            .client(okHttpClient)
+            .addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
+            .build()
+    }
+
+    inline fun <reified T> create(url: String): T {
+        this.url = url
+        return retrofit.create<T>(T::class.java)
+    }
+}
+
+object ServicePool {
+    private const val BASE_URL = BuildConfig.AUTH_BASE_URL
+    private const val REQRES_BASE_URL = BuildConfig.REQRES_BASE_URL
+
+    val authService = ApiFactory.create<AuthService>(BASE_URL)
+    val followerService = ApiFactory.create<FollowerService>(REQRES_BASE_URL)
+}
+
+

app/src/main/java/org/sopt/dosopttemplate/api/AuthService.kt

@@ -0,0 +1,20 @@
+package org.sopt.dosopttemplate.api
+
+import retrofit2.Call
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface AuthService {
+    @POST("api/v1/members/sign-in")
+    suspend fun login(
+        @Body request: RequestLoginDto,
+    ): Response<ResponseLoginDto>
+
+    @POST("api/v1/members")
+    suspend fun signUp(
+        @Body request: RequestSignUpDto,
+    ): Response<Unit>
+}
+
+

app/src/main/java/org/sopt/dosopttemplate/api/AuthViewModel.kt

@@ -0,0 +1,89 @@
+package org.sopt.dosopttemplate.api// 보시면 알겠지만 LiveData는 lifecycle 라이브러리에 들어있습니다!
+// 서비스 객체를 따로 만들지 않고 바로 불러왔습니다.
+// 언제나 그렇듯 Call과 Callback은 Retrofit2의 것을 사용해야 합니다. okhttp 아님 주의!
+import android.util.Log
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.launch
+import org.sopt.dosopttemplate.api.ServicePool.authService
+import org.sopt.dosopttemplate.util.UtilClass.isIdConditionSatisfied
+import org.sopt.dosopttemplate.util.UtilClass.isPasswordConditionSatisfied
+
+class AuthViewModel : ViewModel() {
+    // MutableLiveData를 사용하여 login result 객체를 생성합니다.
+
+    private val _loginResult: MutableLiveData<ResponseLoginDto> = MutableLiveData()
+    val loginResult: MutableLiveData<ResponseLoginDto> get() = _loginResult
+
+    private val _loginSuccess: MutableLiveData<Boolean> = MutableLiveData()
+    val loginSuccess: MutableLiveData<Boolean> get() = _loginSuccess
+
+    private val _signUpResult: MutableLiveData<Unit> = MutableLiveData()
+    val signUpResult: MutableLiveData<Unit> get() = _signUpResult
+
+    private val _signUpSuccess: MutableLiveData<Boolean> = MutableLiveData()
+    val signUpSuccess: MutableLiveData<Boolean> get() = _signUpSuccess
+
+    val isLoginButtonClicked: MutableLiveData<Boolean> = MutableLiveData(false)
+    val idConditionSatisfied: MutableLiveData<Boolean> = MutableLiveData(false)
+    val passwordConditionSatisfied: MutableLiveData<Boolean> = MutableLiveData(false)
+    val loginConditionSatisfied: MutableLiveData<Boolean> = MutableLiveData(idConditionSatisfied.value?:false && passwordConditionSatisfied.value?:false)
+
+    val _id: MutableLiveData<String> = MutableLiveData()
+    val id: String get() = _id.value ?: ""
+    val _password: MutableLiveData<String> = MutableLiveData()
+    val password: String get() = _password.value ?: ""
+    val _nickName: MutableLiveData<String> = MutableLiveData()
+    val nickName: String get() = _nickName.value ?: ""
+
+    fun login() {
+        viewModelScope.launch {
+            kotlin.runCatching {
+                authService.login(RequestLoginDto(id, password))
+            }.onSuccess {
+                if (it.isSuccessful) {
+                    loginResult.value = it.body()
+                    loginSuccess.value = true
+                } else {
+                    loginSuccess.value = false
+                }
+            }.onFailure {
+                // 에러 처리
+            }
+        }
+    }
+
+    fun signUp() {
+        viewModelScope.launch {
+            kotlin.runCatching {
+                authService.signUp(RequestSignUpDto(id, nickName, password))
+            }.onSuccess {
+                if (it.isSuccessful) {
+                    signUpResult.value = it.body()
+                    signUpSuccess.value = true
+                } else {
+                    signUpSuccess.value = false
+                }
+            }.onFailure {
+                // 에러 처리
+            }
+        }
+    }
+
+
+    fun onLoginButtonClick() {
+        isLoginButtonClicked.value = true
+    }
+
+    fun onIDTextChanged() {
+        idConditionSatisfied.value = isIdConditionSatisfied(id)
+        loginConditionSatisfied.value = idConditionSatisfied.value?:false && passwordConditionSatisfied.value?:false
+    }
+
+    fun onPasswordTextChanged() {
+        passwordConditionSatisfied.value = isPasswordConditionSatisfied(password)
+        loginConditionSatisfied.value = idConditionSatisfied.value?:false && passwordConditionSatisfied.value?:false
+        Log.v("logincondition", loginConditionSatisfied.value.toString())
+    }
+}

app/src/main/java/org/sopt/dosopttemplate/api/FollowerService.kt

@@ -0,0 +1,12 @@
+package org.sopt.dosopttemplate.api
+
+import org.sopt.dosopttemplate.BuildConfig
+import retrofit2.Call
+import retrofit2.http.GET
+
+private const val REQURES_BASE_URL =  BuildConfig.REQRES_BASE_URL
+
+interface FollowerService {
+    @GET(REQURES_BASE_URL)
+    fun getFollowerList(): Call<ResponseGetFollwerDto>
+}

app/src/main/java/org/sopt/dosopttemplate/api/RequestLoginDto.kt

@@ -0,0 +1,12 @@
+package org.sopt.dosopttemplate.api
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestLoginDto(
+    @SerialName("username")
+    val username: String,
+    @SerialName("password")
+    val password: String,
+)

app/src/main/java/org/sopt/dosopttemplate/api/RequestSignUpDto.kt

@@ -0,0 +1,14 @@
+package org.sopt.dosopttemplate.api
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestSignUpDto(
+    @SerialName("username")
+    val username: String,
+    @SerialName("nickname")
+    val nickname: String,
+    @SerialName("password")
+    val password: String,
+)

app/src/main/java/org/sopt/dosopttemplate/api/ResponseGetFollowerDto.kt

@@ -0,0 +1,42 @@
+package org.sopt.dosopttemplate.api
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseGetFollwerDto(
+    @SerialName("page")
+    val page: Int,
+    @SerialName("per_page")
+    val perPage: Int,
+    @SerialName("total")
+    val total: Int,
+    @SerialName("total_pages")
+    val totalPages: Int,
+    @SerialName("data")
+    val data: List<ResponseData>,
+    @SerialName("support")
+    val support: ResponseSupport
+)
+
+@Serializable
+data class ResponseSupport(
+    @SerialName("url")
+    val url: String,
+    @SerialName("text")
+    val text: String
+)
+
+@Serializable
+data class ResponseData(
+    @SerialName("id")
+    val id: Int,
+    @SerialName("email")
+    val email: String,
+    @SerialName("first_name")
+    val firstName: String,
+    @SerialName("last_name")
+    val lastName: String,
+    @SerialName("avatar")
+    val avatar: String,
+)

app/src/main/java/org/sopt/dosopttemplate/api/ResponseLoginDto.kt

@@ -0,0 +1,14 @@
+package org.sopt.dosopttemplate.api
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseLoginDto(
+    @SerialName("id")
+    val id: Int,
+    @SerialName("username")
+    val username: String,
+    @SerialName("nickname")
+    val nickname: String,
+)

app/src/main/java/org/sopt/dosopttemplate/api/SignUpResponse.kt

@@ -0,0 +1,7 @@
+package org.sopt.dosopttemplate.api
+
+sealed class SignupResponse {
+    data class ResponseSignUpDto(
+        val location: String
+    )
+}