[Feat] Glance로 구현한 widget #251
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -8,13 +8,14 @@ plugins { | |||||
| alias(libs.plugins.hilt.android) | ||||||
| id("kotlin-parcelize") | ||||||
| id("kotlin-android") | ||||||
| id("com.google.android.gms.oss-licenses-plugin") | ||||||
| id("kotlin-kapt") | ||||||
|
|
||||||
| } | ||||||
|
|
||||||
| android { | ||||||
| namespace = "com.eatssu.android" | ||||||
| compileSdk = 35 | ||||||
|
|
||||||
| // S8: API 28 | ||||||
| // S21: API 33 | ||||||
|
|
@@ -47,12 +48,11 @@ android { | |||||
| buildConfigField("String", "KAKAO_NATIVE_APP_KEY", "\"$kakaoKey\"") | ||||||
| manifestPlaceholders["KAKAO_NATIVE_APP_KEY"] = kakaoKey | ||||||
|
|
||||||
| isMinifyEnabled = false | ||||||
| proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") | ||||||
|
|
||||||
| var shrinkResources = false | ||||||
| var minifyEnabled = false | ||||||
| } | ||||||
|
|
||||||
| debug { | ||||||
|
|
@@ -68,8 +68,6 @@ android { | |||||
| val kakaoKey: String = p.getProperty("KAKAO_NATIVE_APP_KEY") | ||||||
| buildConfigField("String", "KAKAO_NATIVE_APP_KEY", "\"$kakaoKey\"") | ||||||
| manifestPlaceholders["KAKAO_NATIVE_APP_KEY"] = kakaoKey | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -78,14 +76,18 @@ android { | |||||
| targetCompatibility = JavaVersion.VERSION_17 | ||||||
| } | ||||||
|
|
||||||
| composeOptions { | ||||||
| kotlinCompilerExtensionVersion = "1.5.15" | ||||||
| } | ||||||
|
|
||||||
| kotlin { | ||||||
| jvmToolchain(17) | ||||||
| } | ||||||
|
|
||||||
| kotlinOptions { | ||||||
| jvmTarget = JavaVersion.VERSION_17.toString() | ||||||
| } | ||||||
|
|
||||||
| splits { | ||||||
| abi { | ||||||
| isEnable = true | ||||||
|
|
@@ -100,26 +102,34 @@ android { | |||||
| } | ||||||
|
|
||||||
| dependencies { | ||||||
| implementation(project(":core:design-system")) | ||||||
|
|
||||||
| implementation(libs.androidx.core.ktx) | ||||||
| implementation(libs.androidx.appcompat) | ||||||
| implementation(libs.material) | ||||||
| implementation(libs.androidx.constraintlayout) | ||||||
| implementation(libs.threetenabp) | ||||||
| implementation(libs.material.calendarview) | ||||||
| implementation(libs.androidx.recyclerview) | ||||||
| implementation(libs.transport.runtime) | ||||||
| implementation(libs.androidx.activity.ktx) | ||||||
| implementation(libs.androidx.fragment.ktx) | ||||||
|
|
||||||
| //glance | ||||||
| implementation(libs.androidx.glance) | ||||||
| implementation(libs.androidx.glance.preview) | ||||||
| implementation(libs.androidx.glance.appwidget) | ||||||
| implementation(libs.androidx.glance.material3) | ||||||
| debugImplementation(libs.androidx.glance.appwidget.preview) // 프리뷰 지원 | ||||||
|
|
||||||
| // Testing libraries | ||||||
| testImplementation(libs.junit) | ||||||
| androidTestImplementation(libs.androidx.test.ext.junit) | ||||||
| androidTestImplementation(libs.androidx.espresso.core) | ||||||
|
|
||||||
| //retrofit2: 서버통신 | ||||||
| implementation(libs.retrofit) | ||||||
| implementation(libs.retrofit.converter.gson) | ||||||
|
|
||||||
| // Gson for JSON parsing | ||||||
| implementation(libs.gson) | ||||||
|
|
@@ -136,20 +146,23 @@ dependencies { | |||||
| implementation(libs.compressor) | ||||||
|
|
||||||
| // Coroutines for concurrency | ||||||
| implementation(libs.kotlinx.coroutines.android) | ||||||
| implementation(libs.kotlinx.coroutines.core) | ||||||
| implementation(libs.androidx.lifecycle.runtime.ktx) | ||||||
|
|
||||||
| // Kakao login SDK | ||||||
| implementation(libs.kakao.login) | ||||||
|
|
||||||
| // Hilt for Dependency Injection | ||||||
| implementation(libs.hilt.android) | ||||||
| kapt(libs.hilt.android.compiler) | ||||||
| kapt(libs.androidx.hilt.compiler) | ||||||
| implementation(libs.androidx.hilt.common) | ||||||
| implementation(libs.androidx.hilt.work) | ||||||
|
|
||||||
| // ViewModel and LiveData | ||||||
| implementation(libs.androidx.lifecycle.viewmodel.ktx) | ||||||
| implementation(libs.androidx.lifecycle.livedata.ktx) | ||||||
|
|
||||||
| implementation(libs.play.services.base) | ||||||
|
|
||||||
|
|
@@ -167,26 +180,33 @@ dependencies { | |||||
|
|
||||||
| // Compose | ||||||
| implementation(libs.androidx.activity.compose) | ||||||
| implementation(libs.androidx.compose.animation) | ||||||
| implementation(libs.androidx.compose.ui.tooling) | ||||||
| implementation(libs.androidx.compose.lifecycle.viewmodel) | ||||||
| implementation(libs.androidx.compose.lifecycle.runtime) | ||||||
| implementation(platform(libs.androidx.compose.bom)) | ||||||
| implementation(libs.androidx.compose.ui) | ||||||
| implementation(libs.androidx.compose.ui.graphics) | ||||||
| implementation(libs.androidx.compose.ui.tooling.preview) | ||||||
| implementation(libs.androidx.compose.material3) | ||||||
| // androidTestImplementation(libs.androidx.compose.ui.test.junit4) | ||||||
|
There was a problem hiding this comment. Commented-out dependency should either be removed or uncommented if needed for testing.
Suggested change
|
||||||
| implementation(libs.compose.theme.adapter) | ||||||
| implementation(libs.accompanist.appcompat.theme) | ||||||
| androidTestImplementation(libs.androidx.compose.bom) | ||||||
| debugImplementation(libs.androidx.compose.ui.test.manifest) | ||||||
|
|
||||||
| // navigation | ||||||
| implementation(libs.androidx.navigation.fragment) | ||||||
| implementation(libs.androidx.navigation.ui) | ||||||
|
|
||||||
| // worker (Kotlin + coroutines) | ||||||
| implementation(libs.androidx.work.runtime.ktx) | ||||||
|
|
||||||
| //data store (with flow) | ||||||
| implementation(libs.androidx.datastore.preferences) | ||||||
|
|
||||||
| } | ||||||
|
|
||||||
| kapt { | ||||||
| correctErrorTypes = true | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package com.eatssu.android.data.dto.response | ||
|
|
||
| import com.google.gson.annotations.SerializedName | ||
|
|
||
| data class TokenValidationResponse( | ||
HI-JIN2 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| @SerializedName("isValid") | ||
| val isValid: Boolean | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,5 +1,7 @@ | ||||||||||
| package com.eatssu.android.data.enums | ||||||||||
|
|
||||||||||
|
|
||||||||||
|
|
||||||||||
| enum class Restaurant(val displayName: String, val menuType: MenuType) { | ||||||||||
| HAKSIK("학생 식당", MenuType.VARIABLE), | ||||||||||
| DODAM("도담 식당", MenuType.VARIABLE), | ||||||||||
|
|
@@ -8,4 +10,18 @@ enum class Restaurant(val displayName: String, val menuType: MenuType) { | |||||||||
| FOOD_COURT("푸드 코트", MenuType.FIXED), | ||||||||||
| SNACK_CORNER("스낵 코너", MenuType.FIXED), | ||||||||||
| THE_KITCHEN("더 키친", MenuType.FIXED); | ||||||||||
|
|
||||||||||
| companion object { | ||||||||||
|
Member
There was a problem hiding this comment. [ Etc ] data모듈에서 UI <> 서버 <> 비즈니스 로직 간 매핑 함수들이 생겨난거군요 좋네욤 |
||||||||||
|
|
||||||||||
| fun getVariableRestaurantList(): List<Restaurant> { | ||||||||||
| return entries.filter { it.menuType == MenuType.VARIABLE } | ||||||||||
| } | ||||||||||
|
|
||||||||||
| fun fromRestaurantEnumName(enumName: String): String { | ||||||||||
|
Comment on lines
+19
to
+20
There was a problem hiding this comment. Inconsistent indentation on line 19-20. The function declaration should align with the other companion object functions.
Suggested change
|
||||||||||
| return entries.find { it.name == enumName }?.displayName ?: "" | ||||||||||
| } | ||||||||||
|
|
||||||||||
| fun fromDisplayName(name: String): String = | ||||||||||
| entries.find { it.displayName == name }?.name ?: error("Unknown display name: $name") | ||||||||||
| } | ||||||||||
| } | ||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These variables are declared but never used. They should either be assigned to the build configuration properties or removed.