Week7 필수과제 구현

app/build.gradle.kts

@@ -5,11 +5,10 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
-    id("kotlin-kapt")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.hilt)
+    alias(libs.plugins.ksp)
 }
 
-
 val properties = Properties().apply {
     load(project.rootProject.file("local.properties").inputStream())
 }
@@ -39,11 +38,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17 //윈도우에서 hilt 사용 시 java 1.8은 에러가 발생하는 이슈가 있다고함 -> 17 사용 시 해결
+        targetCompatibility = JavaVersion.VERSION_17 //윈도우에서 hilt 사용 시 java 1.8은 에러가 발생하는 이슈가 있다고함 -> 17 사용 시 해결
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17" //윈도우에서 hilt 사용 시 java 1.8은 에러가 발생하는 이슈가 있다고함 -> 17 사용 시 해결
     }
     buildFeatures {
         compose = true
@@ -61,31 +60,31 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
-    implementation(libs.androidx.navigation.runtime.ktx)
-    implementation(libs.androidx.runtime.livedata)
+    implementation(libs.androidx.espresso.core)
+    implementation(libs.androidx.compose.navigation)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(libs.androidx.navigation.compose)
-    implementation(libs.androidx.material)
+
+    //viewmodel
+    implementation (libs.androidx.lifecycle.viewmodel.compose)
+
     // Network
     implementation(platform(libs.okhttp.bom))
     implementation(libs.okhttp)
     implementation(libs.okhttp.logging.interceptor)
     implementation(libs.retrofit)
     implementation(libs.retrofit.kotlin.serialization.converter)
     implementation(libs.kotlinx.serialization.json)
-    //hilt
-    implementation(libs.hilt.android.v2511)
-    kapt(libs.hilt.compiler.v2511)
-    implementation(libs.androidx.hilt.navigation.compose)
-}
 
-kapt {
-    correctErrorTypes = true
+    // hilt
+    implementation(libs.hilt.android)
+    implementation(libs.hilt.navigation.compose)
+    ksp(libs.hilt.compiler)
+    androidTestImplementation(libs.hilt.android.testing)
+    kspAndroidTest(libs.hilt.compiler)
 }

app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".MyApplication"
+        android:name=".WavveApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -15,16 +15,16 @@
         android:theme="@style/Theme.ANDANDROID"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
-
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".WavveApplication"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.ANDANDROID">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
     </application>
+
 </manifest>

app/src/main/java/org/sopt/and/Route.kt

@@ -0,0 +1,22 @@
+package org.sopt.and
+
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+sealed class Route(val route: String) {
+    @Serializable
+    data object Home : Route("home")
+
+    @Serializable
+    data object SignIn : Route("signIn")
+
+    @Serializable
+    data object SignUp : Route("signUp")
+
+    @Serializable
+    data object Search : Route("search")
+
+    @Serializable
+    data object MyInfo : Route("myInfo")
+}

app/src/main/java/org/sopt/and/MyApplication.kt → app/src/main/java/org/sopt/and/WavveApplication.kt.kt

@@ -4,4 +4,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class MyApplication : Application()
+class WavveApplication : Application()

app/src/main/java/org/sopt/and/core/ContentType.kt

@@ -0,0 +1,18 @@
+package org.sopt.and.core
+
+import androidx.annotation.StringRes
+import org.sopt.and.R
+
+enum class ContentType(
+    @StringRes val titleResId: Int
+) {
+    NEW_CLASSIC(R.string.type_new_classic),
+    DRAMA(R.string.type_drama),
+    ENTERTAINMENT(R.string.type_entertainment),
+    MOVIE(R.string.type_movie),
+    ANIMATION(R.string.type_animation),
+    ABROAD_SERIES(R.string.type_abroad_series),
+    INFORMATION_CULTURE(R.string.type_information_culture),
+    KIDS(R.string.type_kids),
+    MOVIE_PLUS(R.string.type_movie_plus),
+}

app/src/main/java/org/sopt/and/core/Route.kt

@@ -0,0 +1,3 @@
+package org.sopt.and.core
+
+interface Route