-
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.
- Loading branch information
Showing
12 changed files
with
173 additions
and
24 deletions.
There are no files selected for viewing
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
8 changes: 7 additions & 1 deletion
8
app/src/main/java/com/stslex/aproselection/SelectApplication.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 |
---|---|---|
@@ -1,17 +1,23 @@ | ||
package com.stslex.aproselection | ||
|
||
import android.app.Application | ||
import com.stslex.aproselection.core.network.di.ModuleCoreNetwork.moduleCoreNetwork | ||
import com.stslex.aproselection.feature.auth.di.ModuleFeatureAuth.moduleFeatureAuth | ||
import org.koin.android.ext.koin.androidContext | ||
import org.koin.android.ext.koin.androidLogger | ||
import org.koin.core.context.startKoin | ||
|
||
class SelectApplication : Application() { | ||
|
||
override fun onCreate() { | ||
super.onCreate() | ||
startKoin { | ||
androidLogger() | ||
androidContext(applicationContext) | ||
modules(moduleFeatureAuth) | ||
modules( | ||
moduleFeatureAuth, | ||
moduleCoreNetwork | ||
) | ||
} | ||
} | ||
} |
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
5 changes: 0 additions & 5 deletions
5
...d-logic/dependencies/src/main/kotlin/com.stslex.aproselection/LocalPropertiesConstants.kt
This file was deleted.
Oops, something went wrong.
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
10 changes: 10 additions & 0 deletions
10
core/network/src/main/java/com/stslex/aproselection/core/network/client/NetworkClient.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,10 @@ | ||
package com.stslex.aproselection.core.network.client | ||
|
||
import io.ktor.client.HttpClient | ||
|
||
interface NetworkClient { | ||
|
||
val client: HttpClient | ||
|
||
val apiClient: HttpClient | ||
} |
63 changes: 63 additions & 0 deletions
63
core/network/src/main/java/com/stslex/aproselection/core/network/client/NetworkClientImpl.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,63 @@ | ||
package com.stslex.aproselection.core.network.client | ||
|
||
import com.stslex.aproselection.core.network.BuildConfig | ||
import io.ktor.client.HttpClient | ||
import io.ktor.client.engine.android.Android | ||
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation | ||
import io.ktor.client.plugins.defaultRequest | ||
import io.ktor.client.plugins.logging.DEFAULT | ||
import io.ktor.client.plugins.logging.LogLevel | ||
import io.ktor.client.plugins.logging.Logger | ||
import io.ktor.client.plugins.logging.Logging | ||
import io.ktor.http.URLProtocol | ||
import io.ktor.serialization.kotlinx.json.json | ||
import kotlinx.serialization.ExperimentalSerializationApi | ||
import kotlinx.serialization.json.Json | ||
|
||
class NetworkClientImpl : NetworkClient { | ||
|
||
@OptIn(ExperimentalSerializationApi::class) | ||
override val client: HttpClient | ||
get() = HttpClient(Android) { | ||
|
||
expectSuccess = true | ||
|
||
install(Logging) { | ||
logger = Logger.DEFAULT | ||
level = LogLevel.ALL | ||
} | ||
|
||
install(ContentNegotiation) { | ||
json( | ||
Json { | ||
prettyPrint = true | ||
isLenient = true | ||
ignoreUnknownKeys = true | ||
explicitNulls = false | ||
} | ||
) | ||
} | ||
} | ||
|
||
override val apiClient: HttpClient | ||
get() = client.config { | ||
defaultRequest { | ||
url { | ||
host = "${BuildConfig.API_SERVER_HOST}$HOST_API_URL" | ||
protocol = URLProtocol.HTTP | ||
} | ||
// headers { | ||
// append( | ||
// HEADER_AUTH, | ||
// "$HEADER_AUTH_FIELD ${BuildConfig.API_KEY}" | ||
// ) | ||
// } | ||
} | ||
} | ||
|
||
companion object { | ||
private const val HOST_API_URL = "/api/v1" | ||
private const val HEADER_AUTH = "Authorization" | ||
private const val HEADER_AUTH_FIELD = "Client-ID" | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
core/network/src/main/java/com/stslex/aproselection/core/network/di/ModuleCoreNetwork.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,14 @@ | ||
package com.stslex.aproselection.core.network.di | ||
|
||
import com.stslex.aproselection.core.network.client.NetworkClient | ||
import com.stslex.aproselection.core.network.client.NetworkClientImpl | ||
import org.koin.core.module.dsl.bind | ||
import org.koin.core.module.dsl.singleOf | ||
import org.koin.dsl.module | ||
|
||
object ModuleCoreNetwork { | ||
|
||
val moduleCoreNetwork = module { | ||
singleOf(::NetworkClientImpl) { bind<NetworkClient>() } | ||
} | ||
} |
22 changes: 22 additions & 0 deletions
22
core/network/src/test/java/com/stslex/aproselection/core/network/ModuleCoreNetworkTest.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,22 @@ | ||
package com.stslex.aproselection.core.network | ||
|
||
import android.content.Context | ||
import com.stslex.aproselection.core.network.di.ModuleCoreNetwork.moduleCoreNetwork | ||
import org.junit.Test | ||
import org.koin.android.ext.koin.androidContext | ||
import org.koin.dsl.koinApplication | ||
import org.koin.test.KoinTest | ||
import org.koin.test.check.checkModules | ||
import org.mockito.Mockito | ||
|
||
class DiKoinModuleTest : KoinTest { | ||
|
||
@Test | ||
fun checkKoinModules() { | ||
koinApplication { | ||
androidContext(Mockito.mock(Context::class.java)) | ||
modules(moduleCoreNetwork) | ||
checkModules() | ||
} | ||
} | ||
} |
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,11 +1,14 @@ | ||
plugins { | ||
id("aproselection.android.library") | ||
id("aproselection.android.library.compose") | ||
kotlin("plugin.serialization") | ||
} | ||
|
||
dependencies { | ||
implementation(project(":core:ui")) | ||
implementation(project(":core:network")) | ||
implementation(libs.bundles.ktor) | ||
implementation(libs.bundles.okhttp) | ||
} | ||
|
||
android.namespace = "com.stslex.aproselection.feature.auth" |
34 changes: 30 additions & 4 deletions
34
feature/auth/src/main/java/com/stslex/aproselection/feature/auth/ui/AuthViewModel.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 |
---|---|---|
@@ -1,15 +1,41 @@ | ||
package com.stslex.aproselection.feature.auth.ui | ||
|
||
import android.util.Log | ||
import androidx.lifecycle.ViewModel | ||
import androidx.lifecycle.viewModelScope | ||
import com.stslex.aproselection.core.network.client.NetworkClient | ||
import io.ktor.client.call.body | ||
import io.ktor.client.request.get | ||
import io.ktor.http.appendPathSegments | ||
import kotlinx.coroutines.flow.SharingStarted | ||
import kotlinx.coroutines.flow.StateFlow | ||
import kotlinx.coroutines.flow.flowOf | ||
import kotlinx.coroutines.flow.catch | ||
import kotlinx.coroutines.flow.flow | ||
import kotlinx.coroutines.flow.stateIn | ||
import kotlinx.serialization.SerialName | ||
import kotlinx.serialization.Serializable | ||
|
||
class AuthViewModel : ViewModel() { | ||
class AuthViewModel( | ||
private val networkClient: NetworkClient | ||
) : ViewModel() { | ||
|
||
val text: StateFlow<String> | ||
get() = flowOf("Hello") | ||
get() = flow { | ||
val result = networkClient.apiClient.get { | ||
url.appendPathSegments("hello") | ||
} | ||
.body<HelloRequest>() | ||
.hello | ||
emit(result) | ||
} | ||
.catch { | ||
Log.e(javaClass.simpleName, it.message, it) | ||
} | ||
.stateIn(viewModelScope, SharingStarted.Lazily, "") | ||
} | ||
} | ||
|
||
@Serializable | ||
data class HelloRequest( | ||
@SerialName("text") | ||
val hello: String | ||
) |