Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.kotlin.serialization)
id("com.google.dagger.hilt.android") // Hilt 플러그인 추가
kotlin("kapt") // Hilt를 위한 kapt 추가
}
Expand Down Expand Up @@ -70,6 +71,8 @@ dependencies {
kapt(libs.hilt.compiler)
implementation(libs.androidx.hilt.navigation.compose)

implementation(libs.kotlinx.serialization.json)

// Retrofit
implementation(libs.retrofit)
implementation(libs.converter.gson)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.kuit.ourmenu.ui.dummy.di
package com.kuit.ourmenu.di

import com.google.gson.Gson
import dagger.Module
Expand All @@ -20,7 +20,7 @@ object NetworkModule {
fun providesRetrofit(
): Retrofit =
Retrofit.Builder()
.baseUrl("")
.baseUrl("https://ourmenu-dev.shop/")
.addConverterFactory(GsonConverterFactory.create(Gson()))
.build()

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.kuit.ourmenu.ui.dummy.di
package com.kuit.ourmenu.di

import com.kuit.ourmenu.ui.dummy.service.DummyService
import com.kuit.ourmenu.dummy.service.DummyService
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.kuit.ourmenu.ui.dummy.data
package com.kuit.ourmenu.dummy.data

data class DummyData(
val name: String = "",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.kuit.ourmenu.ui.dummy.data
package com.kuit.ourmenu.dummy.data

data class DummyResponse(
val name: String = "",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.kuit.ourmenu.ui.dummy.repository
package com.kuit.ourmenu.dummy.repository

import android.util.Log
import com.kuit.ourmenu.ui.dummy.data.DummyData
import com.kuit.ourmenu.ui.dummy.data.toDummyData
import com.kuit.ourmenu.ui.dummy.service.DummyService
import com.kuit.ourmenu.dummy.data.DummyData
import com.kuit.ourmenu.dummy.data.toDummyData
import com.kuit.ourmenu.dummy.service.DummyService
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.kuit.ourmenu.dummy.service

import com.kuit.ourmenu.dummy.data.DummyResponse
import retrofit2.http.GET

interface DummyService {
@GET("")
suspend fun getDummyData(): DummyResponse
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.kuit.ourmenu.ui.dummy.viewmodel
package com.kuit.ourmenu.dummy.viewmodel

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.kuit.ourmenu.ui.dummy.data.DummyData
import com.kuit.ourmenu.ui.dummy.repository.DummyRepository
import com.kuit.ourmenu.dummy.data.DummyData
import com.kuit.ourmenu.dummy.repository.DummyRepository
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
Expand Down
17 changes: 0 additions & 17 deletions app/src/main/java/com/kuit/ourmenu/ui/dummy/di/RepositoryModule.kt

This file was deleted.

This file was deleted.

4 changes: 4 additions & 0 deletions app/src/main/java/com/kuit/ourmenu/ui/navigator/Routes.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package com.kuit.ourmenu.ui.navigator

import kotlinx.serialization.Serializable


sealed interface Routes{
// Home
@Serializable
data object Home: Routes

// 지도
Expand Down
3 changes: 3 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ coreKtx = "1.10.1"
junit = "4.13.2"
junitVersion = "1.1.5"
espressoCore = "3.5.1"
kotlinxSerializationJson = "1.6.0"
lifecycleRuntimeKtx = "2.6.1"
activityCompose = "1.8.0"
composeBom = "2024.04.01"
Expand Down Expand Up @@ -39,11 +40,13 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3"
androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "lifecycleViewmodel" }
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
androidx-lifecycle-runtime-compose-android = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose-android", version.ref = "lifecycleRuntimeComposeAndroid" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid" }
Loading