Skip to content

Commit

Permalink
Merge branch 'heuristic-evaluation' into feat/create-symbol-screen
Browse files Browse the repository at this point in the history
  • Loading branch information
yjeong-k authored Nov 8, 2023
2 parents 17508d0 + e737a20 commit 914ee30
Show file tree
Hide file tree
Showing 565 changed files with 5,103 additions and 256 deletions.
13 changes: 12 additions & 1 deletion frontend/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ android {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
}
}

}

dependencies {
Expand Down Expand Up @@ -105,12 +104,20 @@ dependencies {
implementation("com.squareup.retrofit2:converter-moshi:$retrofitVersion")
implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.1")

// Gson
implementation("com.google.code.gson:gson:2.9.0")

// Room
val roomVersion = "2.6.0"
implementation("androidx.room:room-ktx:$roomVersion")
implementation("androidx.room:room-runtime:$roomVersion")
ksp("androidx.room:room-compiler:$roomVersion")

// Work
val workVersion = "2.8.1"
implementation("androidx.work:work-runtime-ktx:$workVersion")
testImplementation("androidx.work:work-testing:$workVersion")

// Navigation
val navigationVersion = "2.7.5"
implementation("androidx.navigation:navigation-ui-ktx:$navigationVersion")
Expand All @@ -130,4 +137,8 @@ dependencies {
testImplementation("io.mockk:mockk:$mockkVersion")
testImplementation("io.mockk:mockk-agent:$mockkVersion")
testImplementation("io.mockk:mockk-android:$mockkVersion")

// Glide
val glideVersion = "1.0.0-alpha.3"
implementation("com.github.bumptech.glide:compose:$glideVersion")
}
1 change: 1 addition & 0 deletions frontend/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />

<application
Expand Down
98 changes: 98 additions & 0 deletions frontend/app/src/main/assets/categories.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
[
{
"id": 1,
"text": "가족"
},
{
"id": 2,
"text": "계절"
},
{
"id": 3,
"text": "교통"
},
{
"id": 4,
"text": "기념일/일정"
},
{
"id": 5,
"text": "기분감정"
},
{
"id": 6,
"text": "놀이"
},
{
"id": 7,
"text": "동물"
},
{
"id": 8,
"text": "동작"
},
{
"id": 9,
"text": ""
},
{
"id": 10,
"text": "물음"
},
{
"id": 11,
"text": "방향"
},
{
"id": 12,
"text": "사람"
},
{
"id": 13,
"text": "시간"
},
{
"id": 14,
"text": ""
},
{
"id": 15,
"text": "요일"
},
{
"id": 16,
"text": "음식"
},
{
"id": 17,
"text": "인사사회어"
},
{
"id": 18,
"text": "자연"
},
{
"id": 19,
"text": "장소"
},
{
"id": 20,
"text": "직업"
},
{
"id": 21,
"text": ""
},
{
"id": 22,
"text": "학교"
},
{
"id": 23,
"text": "형용사"
},
{
"id": 24,
"text": "기타"
}
]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 914ee30

Please sign in to comment.