Merge pull request #305 from projects200/dev

[Release] 0.4.0 마이페이지 기능 배포

Author: edv-Shin

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*.{kt,kts}]
+ktlint_standard_filename = enabled
+
+
+# DTO 파일 패턴에 대해서만 filename 규칙을 비활성화합니다.
+[*{DTO,Request,Response}.kt]
+ktlint_standard_filename = disabled

.github/workflows/android-dev-ci.yml

@@ -47,6 +47,9 @@ jobs:
       - name: Run Android Lint
         run: ./gradlew lint
 
+      - name: Run Ktlint Check
+        run: ./gradlew ktlintCheck
+
       - name: Run Unit Tests
         run: ./gradlew testDebugUnitTest
 

.github/workflows/android-master-ci-cd.yml

@@ -50,6 +50,9 @@ jobs:
       - name: Run Android Lint
         run: ./gradlew lintRelease
 
+      - name: Run Ktlint Check
+        run: ./gradlew ktlintCheck
+
       - name: Run Unit Tests (Release)
         run: ./gradlew testReleaseUnitTest
 

app/build.gradle.kts

@@ -76,4 +76,4 @@ dependencies {
     implementation(libs.androidx.navigation.ui.ktx)
 
     implementation(libs.appauth)
-}
+}

app/src/androidTest/java/com/project200/undabang/ExampleInstrumentedTest.kt

@@ -1,13 +1,11 @@
 package com.project200.undabang
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import junit.framework.TestCase.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.project200.undabang", appContext.packageName)
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- 인터넷 권한 -->
     <uses-permission android:name="android.permission.INTERNET" />

app/src/main/java/com/project200/undabang/ApplicationClass.kt

@@ -25,14 +25,15 @@ class ApplicationClass : Application() {
      * 기본 알림 채널을 생성합니다.
      */
     private fun createNotificationChannel() {
-        val channel = NotificationChannel(
-            getString(R.string.fcm_channel_id),
-            getString(R.string.fcm_channel_name),
-            NotificationManager.IMPORTANCE_DEFAULT
-        )
+        val channel =
+            NotificationChannel(
+                getString(R.string.fcm_channel_id),
+                getString(R.string.fcm_channel_name),
+                NotificationManager.IMPORTANCE_DEFAULT,
+            )
         val notificationManager: NotificationManager =
             getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
         notificationManager.createNotificationChannel(channel)
     }
-}
+}

app/src/main/java/com/project200/undabang/di/AppModule.kt

@@ -1,7 +1,5 @@
 package com.project200.undabang.di
 
-import android.content.ContentResolver
-import android.content.Context
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.ktx.remoteConfig
@@ -10,27 +8,24 @@ import com.project200.common.utils.ClockProvider
 import com.project200.common.utils.SystemClockProvider
 import com.project200.undabang.BuildConfig
 import com.project200.undabang.R
-import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import timber.log.Timber
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 object AppModule {
-
     @Provides
     @Singleton
     fun provideFirebaseRemoteConfig(): FirebaseRemoteConfig {
         val remoteConfig = Firebase.remoteConfig
 
-        val configSettings = remoteConfigSettings {
-            minimumFetchIntervalInSeconds = if (BuildConfig.DEBUG) 60 else 3600
-        }
+        val configSettings =
+            remoteConfigSettings {
+                minimumFetchIntervalInSeconds = if (BuildConfig.DEBUG) 60 else 3600
+            }
         remoteConfig.setConfigSettingsAsync(configSettings)
 
         // Remote Config 기본값 설정
@@ -41,9 +36,7 @@ object AppModule {
 
     @Provides
     @Singleton
-    fun provideClockProvider(
-        systemClockProvider: SystemClockProvider
-    ): ClockProvider {
+    fun provideClockProvider(systemClockProvider: SystemClockProvider): ClockProvider {
         return systemClockProvider
     }
-}
+}

app/src/main/java/com/project200/undabang/di/NavigationModule.kt

@@ -15,29 +15,33 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 object NavigationModule {
-
     @Provides
     @Singleton
     fun provideAppNavigator(): ActivityNavigator {
         return object : ActivityNavigator {
             override fun navigateToMain(context: Context) {
-                val intent = Intent(context, MainActivity::class.java).apply {
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                }
+                val intent =
+                    Intent(context, MainActivity::class.java).apply {
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                    }
                 context.startActivity(intent)
             }
 
             override fun navigateToLogin(context: Context) {
-                val intent = Intent(context, LoginActivity::class.java).apply {
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                }
+                val intent =
+                    Intent(context, LoginActivity::class.java).apply {
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                    }
                 context.startActivity(intent)
             }
 
-            override fun navigateToWeb(context: Context, url: String) {
+            override fun navigateToWeb(
+                context: Context,
+                url: String,
+            ) {
                 val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
                 context.startActivity(intent)
             }
         }
     }
-}
+}

app/src/main/java/com/project200/undabang/fcm/FcmService.kt

@@ -1,17 +1,16 @@
 package com.project200.undabang.fcm
 
 import android.content.SharedPreferences
-import com.project200.common.constants.FcmConstants.KEY_FCM_TOKEN
+import androidx.core.content.edit
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import com.project200.common.constants.FcmConstants.KEY_FCM_TOKEN
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
-import androidx.core.content.edit
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class FcmService : FirebaseMessagingService() {
-
     @Inject
     lateinit var sharedPreferences: SharedPreferences
 
@@ -58,4 +57,4 @@ class FcmService : FirebaseMessagingService() {
     companion object {
         private const val TAG = "FcmService"
     }
-}
+}