From 40b1176e4b54320ca854a84cdbe60f35fee470ce Mon Sep 17 00:00:00 2001 From: Murat Bilir Date: Thu, 17 Aug 2023 13:11:39 +0300 Subject: [PATCH] WIP Generic adapter implementation. --- .editorconfig | 2 +- .../movee/internal/util/api/NetworkConnectivityInterceptor.kt | 2 +- .../adesso/movee/internal/util/api/RetryAfterInterceptor.kt | 4 ++-- .../adesso/movee/scene/moviedetail/MovieDetailViewModel.kt | 2 +- .../com/adesso/movee/scene/movielist/MovieListViewModel.kt | 3 +-- .../com/adesso/movee/scene/movielist/model/MovieUiModel.kt | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.editorconfig b/.editorconfig index ee8d9e0..fc8801f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,4 +11,4 @@ indent_size = 2 [*.{kt, kts, java}] indent_size = 4 max_line_length = 120 -ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^ +ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,kotlinx.**,^ diff --git a/app/src/main/kotlin/com/adesso/movee/internal/util/api/NetworkConnectivityInterceptor.kt b/app/src/main/kotlin/com/adesso/movee/internal/util/api/NetworkConnectivityInterceptor.kt index 0c79422..f317659 100644 --- a/app/src/main/kotlin/com/adesso/movee/internal/util/api/NetworkConnectivityInterceptor.kt +++ b/app/src/main/kotlin/com/adesso/movee/internal/util/api/NetworkConnectivityInterceptor.kt @@ -2,11 +2,11 @@ package com.adesso.movee.internal.util.api import com.adesso.movee.internal.util.Failure import com.adesso.movee.internal.util.NetworkConnectivityListener -import javax.inject.Inject import okhttp3.Interceptor import okhttp3.Protocol import okhttp3.Response import okhttp3.ResponseBody.Companion.toResponseBody +import javax.inject.Inject class NetworkConnectivityInterceptor @Inject constructor( private val networkConnectivityListener: NetworkConnectivityListener diff --git a/app/src/main/kotlin/com/adesso/movee/internal/util/api/RetryAfterInterceptor.kt b/app/src/main/kotlin/com/adesso/movee/internal/util/api/RetryAfterInterceptor.kt index e8f0954..bd052e8 100644 --- a/app/src/main/kotlin/com/adesso/movee/internal/util/api/RetryAfterInterceptor.kt +++ b/app/src/main/kotlin/com/adesso/movee/internal/util/api/RetryAfterInterceptor.kt @@ -1,10 +1,10 @@ package com.adesso.movee.internal.util.api -import java.io.IOException -import java.net.HttpURLConnection import okhttp3.Interceptor import okhttp3.Response import okhttp3.logging.HttpLoggingInterceptor +import java.io.IOException +import java.net.HttpURLConnection /** * Retry the request in case of "Account Over Queries Per Second Limit" error diff --git a/app/src/main/kotlin/com/adesso/movee/scene/moviedetail/MovieDetailViewModel.kt b/app/src/main/kotlin/com/adesso/movee/scene/moviedetail/MovieDetailViewModel.kt index 19ba6bc..4467e60 100644 --- a/app/src/main/kotlin/com/adesso/movee/scene/moviedetail/MovieDetailViewModel.kt +++ b/app/src/main/kotlin/com/adesso/movee/scene/moviedetail/MovieDetailViewModel.kt @@ -8,10 +8,10 @@ import com.adesso.movee.scene.moviedetail.model.MovieDetailUiModel import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.onSuccess import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow -import javax.inject.Inject @HiltViewModel class MovieDetailViewModel @Inject constructor( diff --git a/app/src/main/kotlin/com/adesso/movee/scene/movielist/MovieListViewModel.kt b/app/src/main/kotlin/com/adesso/movee/scene/movielist/MovieListViewModel.kt index b285587..c54bea6 100644 --- a/app/src/main/kotlin/com/adesso/movee/scene/movielist/MovieListViewModel.kt +++ b/app/src/main/kotlin/com/adesso/movee/scene/movielist/MovieListViewModel.kt @@ -1,7 +1,6 @@ package com.adesso.movee.scene.movielist import androidx.lifecycle.ViewModel -import androidx.lifecycle.navigate import androidx.lifecycle.viewModelScope import com.adesso.movee.base.handleFailure import com.adesso.movee.base.navigate @@ -11,11 +10,11 @@ import com.adesso.movee.scene.movielist.model.MovieUiModel import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.onSuccess import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch -import javax.inject.Inject @HiltViewModel class MovieListViewModel @Inject constructor( diff --git a/app/src/main/kotlin/com/adesso/movee/scene/movielist/model/MovieUiModel.kt b/app/src/main/kotlin/com/adesso/movee/scene/movielist/model/MovieUiModel.kt index a99f8ea..94bdb0d 100644 --- a/app/src/main/kotlin/com/adesso/movee/scene/movielist/model/MovieUiModel.kt +++ b/app/src/main/kotlin/com/adesso/movee/scene/movielist/model/MovieUiModel.kt @@ -3,8 +3,8 @@ package com.adesso.movee.scene.movielist.model import android.os.Parcelable import com.adesso.movee.base.ListAdapterItem import com.adesso.movee.internal.extension.formatDate -import kotlinx.parcelize.Parcelize import java.time.LocalDate +import kotlinx.parcelize.Parcelize @Parcelize data class MovieUiModel(