Main 코드 업데이트

.github/workflows/assign-issue-creator.yml

@@ -0,0 +1,14 @@
+# 각 레포지토리의 .github/workflows/assign-issue-creator.yml
+
+name: Assign issue creator
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  call-reusable-workflow:
+    # @main 은 .github 레포지토리의 main 브랜치를 사용한다는 의미입니다. 버전을 위해 @v1과 같이 태그를 사용하는 것을 권장합니다.
+    uses: 33-Auto/.github/.github/workflows/reusable-assign-issue-creator.yml@main
+    # 이 워크플로우는 secrets를 전달할 필요가 없지만, 필요 시 아래와 같이 전달합니다.
+    # secrets: inherit

.github/workflows/close-issues-on-dev-merge.yml

@@ -0,0 +1,19 @@
+# 각 레포지토리의 .github/workflows/close-issues-on-dev-merge.yml
+
+name: Auto Close Issues on dev merge
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  call-reusable-workflow:
+    if: >
+      github.event.pull_request.merged == true &&
+      github.event.pull_request.base.ref == 'dev'
+    uses: 33-Auto/.github/.github/workflows/reusable-close-linked-issues.yml@main
+    # with를 통해 재사용 워크플로우의 inputs에 값을 전달합니다.
+    with:
+      pr-body: ${{ github.event.pull_request.body }}
+      issue-number: ${{ github.event.pull_request.number }}
+    secrets: inherit # 재사용 워크플로우가 GITHUB_TOKEN을 사용할 수 있도록 전달

.github/workflows/pr-reminder.yml

@@ -1,13 +1,15 @@
-name: PR Reminder
+  name: PR Reminder
 
-on:
-  schedule:
-    - cron: "0 0,5,8 * * *" # 아침 9시, 오후 2시, 오후 5시에 실행 (UTC 기준으로 설정해서 한국 시간에 맞춤)
-  workflow_dispatch:
+  on:
+    schedule:
+      - cron: "47 23,4,7,8,10 * * *" # 아침 8시 47분, 오후 2시 47분, 오후 4시 47분, 오후 5시 47분, 오후 7시 47분 에 실행 (UTC 기준으로 설정해서 한국 시간에 맞춤)
+    workflow_dispatch:
 
-jobs:
-  call-reusable-reminder:
-    uses: 33-Auto/.github/.github/workflows/reusable-pr-reminder.yml@main
-    secrets:
-      # 해당 시크릿은 조직의 시크릿에 저장되어 있음
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+  jobs:
+    call-reusable-reminder:
+      uses: 33-Auto/.github/.github/workflows/reusable-pr-reminder.yml@main
+      secrets:
+        # 해당 시크릿은 조직의 시크릿에 저장되어 있음
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      with:
+        SLACK_USER_MAP: ${{ vars.SLACK_USER_MAP }}

.github/workflows/request-pr-review.yml

@@ -0,0 +1,17 @@
+# 각 레포지토리의 .github/workflows/request-pr-review.yml
+
+name: PR Assignee & Team Review Request
+
+on:
+  pull_request:
+    types: [opened, reopened, ready_for_review]
+
+jobs:
+  call-reusable-workflow:
+    uses: 33-Auto/.github/.github/workflows/reusable-pr-assign-and-review.yml@main
+    with:
+      team-slug-for-review: "review_avengers" # 여기에 리뷰를 요청할 팀의 slug를 입력합니다.
+      pr-author: ${{ github.event.pull_request.user.login }}
+      pr-number: ${{ github.event.pull_request.number }}
+    secrets:
+      ORGANIZATION_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }} # 재사용 워크플로우가 ORGANIZATION_TOKEN을 사용할 수 있도록 전달

app/build.gradle.kts

@@ -1,10 +1,13 @@
 import java.io.FileInputStream
 import java.util.Properties
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
+    id("com.google.devtools.ksp")
+    id("com.google.dagger.hilt.android")
 }
 
 // Keystore.properties
@@ -27,10 +30,10 @@ android {
 
     defaultConfig {
         applicationId = "com.sampoom.android"
-        minSdk = 24
+        minSdk = 26
         targetSdk = 36
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 2
+        versionName = "1.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -48,17 +51,51 @@ android {
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+        isCoreLibraryDesugaringEnabled = true
     }
     buildFeatures {
         compose = true
+        buildConfig = true
+    }
+}
+
+// Kotlin compiler options migrated to Compiler Options DSL
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_11)
     }
 }
 
 dependencies {
+    // hilt
+    implementation(libs.hilt.android)
+    ksp(libs.hilt.android.compiler)
+    implementation(libs.androidx.hilt.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.hilt.navigation.compose)
+
+    // Navigation
+    implementation(libs.androidx.navigation.compose)
+
+    // Retrofit
+    implementation(libs.retrofit)
+    implementation(libs.converter.gson)
+
+    // OKHttp
+    implementation(libs.logging.interceptor)
+
+    // DataStore
+    implementation(libs.androidx.datastore.preferences)
+
+    // Paging
+    implementation(libs.androidx.paging.runtime)
+    implementation(libs.androidx.paging.compose)
+
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
 
+    implementation(libs.androidx.core.splashscreen)
+    implementation(libs.androidx.material)
+    implementation(libs.androidx.material.icons.core)
+    implementation(libs.androidx.material.icons.extended)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)

app/src/main/AndroidManifest.xml

@@ -2,19 +2,27 @@
 <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=".app.Application"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/Theme.SampoomManagement">
+
+        <meta-data
+            android:name="com.android.application.theme_icon"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.SampoomManagement">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/sampoom/android/MainActivity.kt

@@ -1,47 +1,38 @@
 package com.sampoom.android
 
+import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import com.sampoom.android.ui.theme.SampoomManagementTheme
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import com.sampoom.android.app.navigation.AppNavHost
+import com.sampoom.android.core.ui.theme.SampoomManagementTheme
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(
+                lightScrim = Color.Transparent.toArgb(),
+                darkScrim = Color.Transparent.toArgb()
+            ),
+            navigationBarStyle = SystemBarStyle.auto(
+                lightScrim = Color.Transparent.toArgb(),
+                darkScrim = Color.Transparent.toArgb()
+            )
+        )
+        if (Build.VERSION.SDK_INT >= 29) {
+            window.isNavigationBarContrastEnforced = false
+        }
         setContent {
             SampoomManagementTheme {
-                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
-                    Greeting(
-                        name = "Android",
-                        modifier = Modifier.padding(innerPadding)
-                    )
-                }
+                AppNavHost()
             }
         }
     }
-}
-
-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Hello $name!",
-        modifier = modifier
-    )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    SampoomManagementTheme {
-        Greeting("Android")
-    }
 }

app/src/main/java/com/sampoom/android/MainActivityViewModel.kt

@@ -0,0 +1,27 @@
+package com.sampoom.android
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.sampoom.android.core.util.GlobalMessageHandler
+import com.sampoom.android.feature.auth.domain.model.User
+import com.sampoom.android.feature.auth.domain.usecase.GetStoredUserUseCase
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class MainActivityViewModel @Inject constructor(
+    val messageHandler: GlobalMessageHandler,
+    private val getStoredUserUseCase: GetStoredUserUseCase
+) : ViewModel() {
+    private val _user = MutableStateFlow<User?>(null)
+    val user: StateFlow<User?> = _user
+
+    init {
+        viewModelScope.launch {
+            _user.value = getStoredUserUseCase()
+        }
+    }
+}

app/src/main/java/com/sampoom/android/app/Application.kt

@@ -0,0 +1,7 @@
+package com.sampoom.android.app
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class Application : Application()