Merge pull request #7 from Nexters/feature/implement-google-login

구글 로그인 구현 및 Hilt 작업

.github/workflows/build-android-app.yml

@@ -23,4 +23,4 @@ jobs:
           echo MISSION_MATE_BASE_URL=\"$MISSION_MATE_BASE_URL\" >> ./local.properties
 
       - name: Build with Gradle
-        run: fastlane beta
+        run: fastlane test

.gitignore

@@ -56,6 +56,7 @@ build/
 
 # Local configuration file (sdk path, etc)
 local.properties
+keystore.properties
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -164,4 +165,5 @@ google-services.json
 
 
 # End of https://www.gitignore.io/api/kotlin,androidstudio
-/app/keystore
+/app/keystore
+/app/mission-mate-keystore.jks

app/build.gradle.kts

@@ -1,4 +1,6 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import java.io.FileInputStream
+import java.util.Properties
 
 plugins {
     alias(libs.plugins.android.application)
@@ -7,6 +9,10 @@ plugins {
     alias(libs.plugins.kotlin.ksp)
 }
 
+//val keystorePropertiesFile = rootProject.file("keystore.properties")
+//val keystoreProperties = Properties()
+//keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+
 android {
     namespace = "com.goalpanzi.mission_mate"
     compileSdk = 34
@@ -24,15 +30,28 @@ android {
         }
     }
 
+//    signingConfigs {
+//        create("release") {
+//            keyAlias = keystoreProperties["keyAlias"] as String
+//            keyPassword = keystoreProperties["keyPassword"] as String
+//            storeFile = file(keystoreProperties["storeFile"] as String)
+//            storePassword = keystoreProperties["storePassword"] as String
+//        }
+//    }
+
     buildTypes {
         release {
-            isMinifyEnabled = false
+            getByName("debug")
+//            signingConfig = signingConfigs.getByName("release")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
         }
     }
+    buildFeatures {
+        buildConfig = true
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -57,4 +76,5 @@ dependencies {
     implementation(project(":feature:main"))
     implementation(project(":feature:login"))
     implementation(project(":core:designsystem"))
-}
+    implementation(project(":core:data"))
+}

app/proguard-rules.pro

@@ -18,4 +18,12 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class * { *; }
+-keep interface * { *; }
+
+# Keep Dependency Injection Framework related classes and methods
+-keep class dagger.hilt.** { *; }
+-keep class javax.inject.** { *; }
+-keep class javax.annotation.** { *; }

app/src/main/AndroidManifest.xml

@@ -2,6 +2,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:name=".MainApplication"
         android:allowBackup="true"
@@ -12,7 +14,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Missionmate"
-        tools:targetApi="31">
-    </application>
+        android:networkSecurityConfig="@xml/network_security_config"
+        tools:targetApi="31"/>
 
 </manifest>

app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">223.130.130.31</domain>
+    </domain-config>
+</network-security-config>

core/data/build.gradle.kts

@@ -15,12 +15,10 @@ android {
         minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
     }
 
     buildTypes {
         release {
-            isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -45,4 +43,8 @@ dependencies {
 
     ksp(libs.hilt.compiler)
     implementation(libs.hilt.android)
+
+    implementation(project(":core:domain"))
+    implementation(project(":core:model"))
+    implementation(project(":core:network"))
 }

core/data/proguard-rules.pro

@@ -18,4 +18,12 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class * { *; }
+-keep interface * { *; }
+
+# Keep Dependency Injection Framework related classes and methods
+-keep class dagger.hilt.** { *; }
+-keep class javax.inject.** { *; }
+-keep class javax.annotation.** { *; }

core/data/src/main/java/com/goalpanzi/mission_mate/core/data/di/DataModule.kt

@@ -0,0 +1,16 @@
+package com.goalpanzi.mission_mate.core.data.di
+
+import com.goalpanzi.mission_mate.core.data.repository.LoginRepositoryImpl
+import com.goalpanzi.mission_mate.core.domain.repository.LoginRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal abstract class DataModule {
+
+    @Binds
+    abstract fun bindLoginRepository(impl: LoginRepositoryImpl): LoginRepository
+}

core/data/src/main/java/com/goalpanzi/mission_mate/core/data/di/DispatchersModule.kt

@@ -0,0 +1,27 @@
+package com.goalpanzi.mission_mate.core.data.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Dispatcher(val dispatchers: MissionMateDispatcher)
+
+enum class MissionMateDispatcher {
+    IO
+}
+
+@Module
+@InstallIn(SingletonComponent::class)
+interface DispatchersModule {
+
+    @Provides
+    @Dispatcher(MissionMateDispatcher.IO)
+    fun providesIODispatcher(): CoroutineDispatcher = Dispatchers.IO
+
+}

core/data/src/main/java/com/goalpanzi/mission_mate/core/data/repository/LoginRepositoryImpl.kt

@@ -0,0 +1,18 @@
+package com.goalpanzi.mission_mate.core.data.repository
+
+import com.goalpanzi.mission_mate.core.domain.repository.LoginRepository
+import com.goalpanzi.mission_mate.core.network.service.LoginService
+import com.luckyoct.core.model.GoogleLogin
+import com.luckyoct.core.model.request.GoogleLoginRequest
+import javax.inject.Inject
+
+class LoginRepositoryImpl @Inject constructor(
+    private val loginService: LoginService
+): LoginRepository {
+
+    override suspend fun requestGoogleLogin(token: String, email: String): GoogleLogin {
+        val request = GoogleLoginRequest(identityToken = token, email = email)
+        val response = loginService.requestGoogleLogin(request)
+        return response
+    }
+}

core/datastore/build.gradle.kts

@@ -15,12 +15,10 @@ android {
         minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
     }
 
     buildTypes {
         release {
-            isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

core/datastore/proguard-rules.pro

@@ -18,4 +18,12 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class * { *; }
+-keep interface * { *; }
+
+# Keep Dependency Injection Framework related classes and methods
+-keep class dagger.hilt.** { *; }
+-keep class javax.inject.** { *; }
+-keep class javax.annotation.** { *; }

core/designsystem/build.gradle.kts

@@ -14,12 +14,10 @@ android {
         minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
     }
 
     buildTypes {
         release {
-            isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

core/designsystem/proguard-rules.pro

@@ -18,4 +18,12 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class * { *; }
+-keep interface * { *; }
+
+# Keep Dependency Injection Framework related classes and methods
+-keep class dagger.hilt.** { *; }
+-keep class javax.inject.** { *; }
+-keep class javax.annotation.** { *; }

core/designsystem/src/main/java/com/goalpanzi/mission_mate/core/designsystem/theme/Color.kt

@@ -8,4 +8,6 @@ val Pink80 = Color(0xFFEFB8C8)
 
 val Purple40 = Color(0xFF6650a4)
 val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
+val Pink40 = Color(0xFF7D5260)
+
+val Orange01 = Color(0xFFF5EDEA)

core/domain/build.gradle.kts

@@ -15,12 +15,10 @@ android {
         minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
     }
 
     buildTypes {
         release {
-            isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -45,4 +43,6 @@ dependencies {
 
     ksp(libs.hilt.compiler)
     implementation(libs.hilt.android)
+
+    implementation(project(":core:model"))
 }

core/domain/proguard-rules.pro

@@ -18,4 +18,12 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class * { *; }
+-keep interface * { *; }
+
+# Keep Dependency Injection Framework related classes and methods
+-keep class dagger.hilt.** { *; }
+-keep class javax.inject.** { *; }
+-keep class javax.annotation.** { *; }