merge: develop-AN, develop-BE to release-v1.1.0

.github/workflows/android.yml

@@ -0,0 +1,108 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "develop-AN" ]
+    paths:
+      - 'android/**'
+  pull_request:
+    branches: [ "develop-AN" ]
+    paths:
+      - 'android/**'
+
+defaults:
+  run:
+    working-directory: ./android
+
+jobs:
+  ktlint_check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/buildSrc/**/*.kt') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Create google-services
+        run: echo "${{ secrets.GOOGLE_SERVICES_JSON }}" > ./app/google-services.json
+
+      - name: Create local.properties
+        env:
+          BASE_URL: ${{ secrets.BASE_URL }}
+          TOKEN: ${{ secrets.TOKEN }}
+          NATIVE_APP_KEY: ${{ secrets.NATIVE_APP_KEY }}
+        run: |
+          echo "sdk.dir=/Users/chaehyun/Library/Android/sdk" > ./local.properties
+          echo "base_url=$BASE_URL" >> ./local.properties
+          echo "token=$TOKEN" >> ./local.properties
+          echo "native_app_key=$NATIVE_APP_KEY" >> ./local.properties
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Ktlint check
+        run: ./gradlew ktlintCheck
+
+  build_and_test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/buildSrc/**/*.kt') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Create google-services.json
+        env:
+          GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
+        run: echo "$GOOGLE_SERVICES_JSON" > app/google-services.json
+
+      - name: Create local.properties
+        env:
+          BASE_URL: ${{ secrets.BASE_URL }}
+          TOKEN: ${{ secrets.TOKEN }}
+          NATIVE_APP_KEY: ${{ secrets.NATIVE_APP_KEY }}
+        run: |
+          echo "sdk.dir=/Users/chaehyun/Library/Android/sdk" > ./local.properties
+          echo "base_url=$BASE_URL" >> ./local.properties
+          echo "token=$TOKEN" >> ./local.properties
+          echo "native_app_key=$NATIVE_APP_KEY" >> ./local.properties
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Gradle Clean check
+        run: ./gradlew clean
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Run Unit Test
+        run: ./gradlew test

android/app/build.gradle.kts

@@ -1,32 +1,62 @@
+import java.io.FileInputStream
+import java.util.Properties
+
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("de.mannodermaus.android-junit5") version "1.10.0.0"
     id("kotlin-kapt")
+    id("com.google.gms.google-services")
     kotlin("plugin.serialization") version "2.0.0"
+    id("com.google.firebase.crashlytics")
 }
 
 android {
     namespace = "com.zzang.chongdae"
     compileSdk = 34
-
+
+    val properties =
+        Properties().apply {
+            try {
+                load(FileInputStream(rootProject.file("local.properties")))
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+
     defaultConfig {
         applicationId = "com.zzang.chongdae"
         minSdk = 26
         targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
-        
+        versionCode = 2
+        versionName = "1.1.0"
+
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["runnerBuilder"] = "de.mannodermaus.junit5.AndroidJUnit5Builder"
         vectorDrawables {
             useSupportLibrary = true
         }
+
+        val baseUrl = properties.getProperty("base_url")
+        val token = properties.getProperty("token")
+        val nativeAppKey = properties.getProperty("native_app_key")
+
+        buildConfigField("String", "BASE_URL", "\"$baseUrl\"")
+        buildConfigField("String", "TOKEN", "\"$token\"")
+        buildConfigField("String", "NATIVE_APP_KEY", "\"$nativeAppKey\"")
+        manifestPlaceholders["native_app_key"] = nativeAppKey
     }
-    
+
     buildTypes {
+        debug {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+        }
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
@@ -47,15 +77,17 @@ android {
         }
     }
     buildFeatures {
-        dataBinding = true
+        buildConfig = true
     }
-    
+
     dataBinding {
         enable = true
     }
 }
 
 dependencies {
+    val navigationVersion = "2.7.7"
+    val fragmentVersion = "1.8.1"
     implementation("androidx.core:core-ktx:1.10.1")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.10.0")
@@ -73,30 +105,70 @@ dependencies {
     androidTestImplementation("io.kotest:kotest-runner-junit5:5.8.0")
     androidTestImplementation("de.mannodermaus.junit5:android-test-core:1.3.0")
     androidTestRuntimeOnly("de.mannodermaus.junit5:android-test-runner:1.3.0")
-
+    // Testing Navigation
+    androidTestImplementation("androidx.navigation:navigation-testing:$navigationVersion")
+
     implementation("androidx.room:room-runtime:2.6.1")
     kapt("androidx.room:room-compiler:2.6.1")
+    implementation("androidx.room:room-ktx:2.6.1")
     implementation("com.google.code.gson:gson:2.8.8")
-    
+
     implementation("com.github.bumptech.glide:glide:4.12.0")
     kapt("com.github.bumptech.glide:compiler:4.12.0")
     testImplementation("androidx.arch.core:core-testing:2.1.0")
     implementation("com.squareup.okhttp3:mockwebserver:4.12.0")
-    
+
     implementation("com.squareup.retrofit2:retrofit:2.11.0")
     implementation("com.squareup.retrofit2:converter-gson:2.11.0")
-    
+
     implementation("androidx.room:room-ktx:2.6.1")
-    
+
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
     implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0")
-    
+
     kapt("com.github.bumptech.glide:compiler:4.13.2")
-    
+
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
     implementation("androidx.activity:activity-ktx:1.9.0")
     implementation("androidx.fragment:fragment-ktx:1.7.0")
     implementation("androidx.core:core-ktx:1.10.1")
     implementation(libs.androidx.core.ktx)
+
+    // Navigation
+    implementation("androidx.navigation:navigation-fragment-ktx:$navigationVersion")
+    implementation("androidx.navigation:navigation-ui-ktx:$navigationVersion")
+
+    // UI Test - Fragment Scenario
+    debugImplementation("androidx.fragment:fragment-testing-manifest:$fragmentVersion")
+    androidTestImplementation("androidx.fragment:fragment-testing:$fragmentVersion")
+
+    // Espresso
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation("androidx.test:runner:1.4.0")
+
+    // Espresso RecyclerView Actions
+    androidTestImplementation("androidx.test.espresso:espresso-contrib:3.3.0")
+
+    // Pagination
+    implementation("androidx.paging:paging-runtime-ktx:3.3.0")
+
+    // WebView
+    implementation("androidx.webkit:webkit:1.9.0")
+
+    // Firebase
+    implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
+    implementation("com.google.firebase:firebase-analytics")
+
+    // 카카오 로그인
+    implementation("com.kakao.sdk:v2-all:2.20.3")
+
+    // data store
+    implementation("androidx.datastore:datastore-preferences:1.0.0")
+
+    implementation("com.google.firebase:firebase-crashlytics")
+
+    // mockk
+    testImplementation("io.mockk:mockk:1.13.10")
 }

android/app/proguard-rules.pro

@@ -18,4 +18,87 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+# retrofit
+-keep class com.squareup.retrofit2.** { *; }
+-keep class retrofit2.** { *; }
+-keepclassmembers,allowobfuscation class * {
+    @retrofit2.http.* <methods>;
+}
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class com.google.gson.** { *; }
+-keep class kotlinx.serialization.** { *; }
+-keep class com.zzang.chongdae.data.remote.dto.* { <fields>; }
+
+
+# room
+-keep class androidx.room.** { *; }
+-keep interface androidx.room.** { *; }
+-keepclassmembers class * {
+    @androidx.room.* <fields>;
+}
+
+# glide
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public class * extends com.bumptech.glide.module.LibraryGlideModule
+
+-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+    **[] $VALUES;
+    public *;
+}
+
+-keep class * extends com.bumptech.glide.GeneratedAppGlideModule { *; }
+
+# firebase
+-keep class com.google.firebase.** { *; }
+-keep class com.google.android.gms.** { *; }
+-keepattributes *Annotation*
+-keepattributes SourceFile,LineNumberTable
+-keep public class * extends java.lang.Exception
+
+# kakao login
+-keep class com.kakao.sdk.**.model.* { <fields>; }
+
+# R8 full mode strips generic signatures from return types if not kept.
+-if interface * { @retrofit2.http.* public *** *(...); }
+-keep,allowoptimization,allowshrinking,allowobfuscation class <3>
+
+# paging
+-keep class androidx.paging.** { *; }
+
+# datastore
+-keep class androidx.datastore.** { *; }
+-keepclassmembers class androidx.datastore.** { *; }
+
+# mock
+-keep class io.mockk.** { *; }
+-dontwarn okhttp3.mockwebserver.**
+
+# webview
+-keepclassmembers class * {
+    @android.webkit.JavascriptInterface <methods>;
+}
+
+-keepclassmembers class com.zzang.chongdae.presentation.view.address.JavascriptInterface{
+    public *;
+}
+
+-keep public class com.zzang.chongdae.presentation.view.address.JavascriptInterface
+
+-keepclassmembers class kotlinx.coroutines.** {
+    *;
+}
+
+
+-dontwarn org.bouncycastle.jsse.**
+-dontwarn org.conscrypt.*
+-dontwarn org.openjsse.**
+
+-dontwarn javax.swing.**
+-dontwarn java.awt.**
+-dontwarn java.lang.instrument.**
+-dontwarn java.lang.management.**
+-dontwarn org.w3c.dom.bootstrap.DOMImplementationRegistry
+-dontwarn reactor.blockhound.**

android/app/src/androidTest/java/com/zzang/chongdae/CommentRoomsFragmentTest.kt

@@ -0,0 +1,30 @@
+package com.zzang.chongdae
+
+import androidx.fragment.app.testing.FragmentScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.zzang.chongdae.presentation.view.comment.CommentRoomsFragment
+import org.junit.Before
+import org.junit.Test
+import org.junit.jupiter.api.DisplayName
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class CommentRoomsFragmentTest {
+    private lateinit var scenario: FragmentScenario<CommentRoomsFragment>
+
+    @Before
+    fun setUp() {
+        scenario = FragmentScenario.launchInContainer(CommentRoomsFragment::class.java)
+    }
+
+    @Test
+    @DisplayName("댓글방 목록으로 이동하면 채팅이라는 텍스트뷰가 보여야 한다")
+    fun commentRoomTest1() {
+        // then
+        onView(withId(R.id.tv_comment_text)).check(matches(isDisplayed()))
+    }
+}