-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #322 from 6QuizOnTheBlock/and/feat#301-sse
And/feat#301 sse
- Loading branch information
Showing
9 changed files
with
156 additions
and
18 deletions.
There are no files selected for viewing
9 changes: 9 additions & 0 deletions
9
android/core/model/src/main/java/com/sixkids/model/SseEventType.kt
This file contains 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,9 @@ | ||
package com.sixkids.model | ||
|
||
enum class SseEventType { | ||
SSE_CONNECT, | ||
INVITE_REQUEST, | ||
INVITE_RESPONSE, | ||
KICK_MEMBER, | ||
CREATE_GROUP, | ||
} |
This file contains 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 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 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 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 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,12 +1,35 @@ | ||
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties | ||
import java.util.Properties | ||
|
||
plugins { | ||
alias(libs.plugins.sixkids.android.feature.compose) | ||
} | ||
|
||
fun getProperty(propertyKey: String): String = | ||
gradleLocalProperties(rootDir, providers).getProperty(propertyKey) | ||
|
||
android { | ||
namespace = "com.sixkids.student.challenge" | ||
defaultConfig { | ||
val localProperties = Properties() | ||
val localPropertiesFile = rootProject.file("local.properties") | ||
if (localPropertiesFile.exists()) { | ||
localProperties.load(localPropertiesFile.inputStream()) | ||
} | ||
|
||
val sseUrl = localProperties.getProperty("SSE_ENDPOINT") ?: "" | ||
|
||
buildConfigField("String", "SSE_ENDPOINT", "\"${sseUrl}\"") | ||
} | ||
|
||
buildFeatures { | ||
buildConfig = true | ||
} | ||
} | ||
|
||
dependencies { | ||
implementation(libs.bundles.paging) | ||
implementation(projects.core.bluetooth) | ||
implementation(libs.okhttp.sse) | ||
implementation(libs.okhttp.logginginterceptor) | ||
} |
This file contains 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
98 changes: 97 additions & 1 deletion
98
...re/student/challenge/src/main/kotlin/com/sixkids/student/group/join/JoinGroupViewModel.kt
This file contains 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 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