Prepare client to work with back-end api #14
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
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 |
|---|---|---|
| @@ -1,39 +1,24 @@ | ||
| package com.academy.android | ||
|
|
||
| import android.os.Bundle | ||
| import androidx.activity.ComponentActivity | ||
| import androidx.activity.compose.setContent | ||
| import androidx.navigation.compose.rememberNavController | ||
| import com.academy.android.ui.AcademyTheme | ||
| import com.academy.android.ui.StartNavigation | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
|
|
||
| @AndroidEntryPoint | ||
| class MainActivity : ComponentActivity() { | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| setContent { | ||
| val navController = rememberNavController() | ||
|
|
||
| AcademyTheme { | ||
| StartNavigation(navController = navController) | ||
| } | ||
| } | ||
| } | ||
| } |
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,59 @@ | ||
| package com.academy.android.data | ||
|
|
||
| import android.content.Context | ||
| import androidx.datastore.preferences.core.Preferences | ||
| import androidx.datastore.preferences.core.edit | ||
| import androidx.datastore.preferences.core.stringPreferencesKey | ||
| import androidx.datastore.preferences.preferencesDataStore | ||
| import com.academy.android.domain.OperationResult | ||
| import com.academy.android.domain.models.UserProfile | ||
| import dagger.hilt.android.qualifiers.ApplicationContext | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.map | ||
| import kotlinx.serialization.json.Json | ||
| import javax.inject.Inject | ||
| import javax.inject.Singleton | ||
|
|
||
| @Singleton | ||
| class PrefsStorage @Inject constructor( | ||
| @ApplicationContext private val appContext: Context | ||
| ) { | ||
| private val Context.dataStore by preferencesDataStore("settings") | ||
|
|
||
| suspend fun writeString(key: Preferences.Key<String>, value: String) { | ||
| appContext.dataStore.edit { prefs -> | ||
| prefs[key] = value | ||
| } | ||
| } | ||
|
|
||
| fun readString(key: Preferences.Key<String>, default: String): Flow<String> = | ||
| appContext.dataStore.data | ||
| .map { prefs -> | ||
| prefs[key] ?: default | ||
| } | ||
|
|
||
| suspend fun saveProfile(profile: UserProfile) { | ||
| val serializedProfile = Json.encodeToString(UserProfile.serializer(), profile) | ||
| appContext.dataStore.edit { prefs -> | ||
| prefs[PROFILE_KEY] = serializedProfile | ||
| } | ||
| } | ||
|
|
||
| fun loadProfile(): Flow<OperationResult<UserProfile, Throwable?>> = | ||
| appContext.dataStore | ||
| .data | ||
| .map { prefs -> | ||
| val profile = prefs[PROFILE_KEY] | ||
| OperationResult.Success( | ||
| data = if (profile != null) { | ||
| Json.decodeFromString(UserProfile.serializer(), profile) | ||
| } else { | ||
| UserProfile.UNKNOWN | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| companion object { | ||
| private val PROFILE_KEY = stringPreferencesKey("user_profile") | ||
| } | ||
| } |
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,56 @@ | ||
| package com.academy.android.data.network | ||
|
|
||
| import com.academy.android.data.network.models.CourseDTO | ||
| import com.academy.android.data.network.models.LectureDTO | ||
| import com.academy.android.data.network.models.LoginRequestDTO | ||
| import com.academy.android.data.network.models.LoginResponseDTO | ||
| import com.academy.android.data.network.models.RegisterRequestDTO | ||
| import com.academy.android.data.network.models.UpdateCourseRequestDTO | ||
| import com.academy.android.data.network.models.UpdateLectureRequestDTO | ||
| import retrofit2.http.Body | ||
| import retrofit2.http.GET | ||
| import retrofit2.http.POST | ||
| import retrofit2.http.Query | ||
|
|
||
| interface ServerApi { | ||
| @POST("login") | ||
| suspend fun login( | ||
| @Body loginRequest: LoginRequestDTO | ||
| ): LoginResponseDTO | ||
|
|
||
| @POST("register") | ||
| suspend fun register( | ||
| @Body registerRequestDTO: RegisterRequestDTO | ||
| ): LoginResponseDTO | ||
|
|
||
| @GET("courses/favorite") | ||
| suspend fun getFavouriteCourses(): List<CourseDTO> | ||
|
|
||
| @GET("courses/all") | ||
| suspend fun getAllCourses(): List<CourseDTO> | ||
|
|
||
| @POST("courses/update") | ||
| suspend fun updateCourse( | ||
| @Body updateCourseRequestDTO: UpdateCourseRequestDTO | ||
| ) | ||
|
|
||
| @POST("lectures/update") | ||
| suspend fun updateLecture( | ||
| @Body updateLectureRequestDTO: UpdateLectureRequestDTO | ||
| ) | ||
|
|
||
| @GET("lectures/all") | ||
| suspend fun getAllLectures( | ||
| @Query(value = "courseId") courseId: Long | ||
| ): List<LectureDTO> | ||
|
|
||
| @GET("lectures/by-id") | ||
| suspend fun getLectureById( | ||
| @Query(value = "lectureId") lectureId: Long | ||
|
Author
There was a problem hiding this comment. Better to use a path variable, I think |
||
| ): LectureDTO | ||
|
|
||
| @POST("user/update-fcm-token") | ||
| suspend fun updateFcmToken( | ||
| @Body fcmToken: String | ||
| ) | ||
| } | ||
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,36 @@ | ||
| package com.academy.android.data.network | ||
|
|
||
| import okhttp3.Authenticator | ||
| import okhttp3.Request | ||
| import okhttp3.Response | ||
| import okhttp3.Route | ||
| import javax.inject.Inject | ||
|
|
||
| // fixme: fix user auth | ||
| class TokenAuthenticator @Inject constructor( | ||
| // private val prefsStorage: PrefsStorage | ||
|
Author
There was a problem hiding this comment. Add a PrefsStorage having DataStore under the hood |
||
| ) : Authenticator { | ||
| override fun authenticate(route: Route?, response: Response): Request? = | ||
| if (responseCount(response) < MAX_ATTEMPTS) { | ||
| response.request | ||
| .newBuilder() | ||
| // .header(AUTH_HEADER, prefsStorage.loadUser()?.token.orEmpty()) | ||
| .build() | ||
| } else { | ||
| null | ||
| } | ||
|
|
||
| private fun responseCount(response: Response): Int { | ||
| var result = 1 | ||
| var r: Response? = response | ||
| while (true) { | ||
| r = r?.priorResponse ?: return result | ||
| result++ | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| const val MAX_ATTEMPTS = 3 | ||
| const val AUTH_HEADER = "Token" | ||
| } | ||
| } | ||
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,13 @@ | ||
| package com.academy.android.data.network.models | ||
|
|
||
| import com.academy.android.domain.models.AdditionalMaterial | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class AdditionalMaterialDTO( | ||
| val topicName: String, | ||
| val url: String | ||
| ) | ||
|
|
||
| fun AdditionalMaterialDTO.toAdditionalMaterial(): AdditionalMaterial = | ||
| AdditionalMaterial(topicName = topicName, url = url) |
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.
Better to use path variable, like:
{courseId}/lectures