More fixes after rebasing

DigitalCampus · Oct 31, 2023 · 7db29bb · 7db29bb
1 parent 13d5c5a
commit 7db29bb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/app/src/main/java/org/digitalcampus/oppiamobile/data/course/di.kt b/app/src/main/java/org/digitalcampus/oppiamobile/data/course/di.kt
@@ -7,15 +7,8 @@ import dagger.hilt.components.SingletonComponent
 import org.digitalcampus.oppiamobile.data.config.db.AppDatabase
 import org.digitalcampus.oppiamobile.data.course.remote.CourseRemoteService
 import org.digitalcampus.oppiamobile.data.course.repository.CourseRemoteDataSource
-import org.digitalcampus.oppiamobile.data.user.db.dao.UserDao
-import org.digitalcampus.oppiamobile.data.user.remote.auth.AuthRemoteService
-import org.digitalcampus.oppiamobile.data.user.repository.UserDbDataSource
-import org.digitalcampus.oppiamobile.data.user.repository.UserRemoteDataSource
-import org.digitalcampus.oppiamobile.data.user.repository.UserRepository
 import org.digitalcampus.oppiamobile.di.ApiKey
 import org.digitalcampus.oppiamobile.domain.use_cases.TestApiClientUseCase
-import org.digitalcampus.oppiamobile.domain.use_cases.UserLoginLocalUseCase
-import org.digitalcampus.oppiamobile.domain.use_cases.UserLoginRemoteUseCase
 import retrofit2.Retrofit
 import retrofit2.create
 import javax.inject.Singleton

diff --git a/app/src/main/java/org/digitalcampus/oppiamobile/data/user/di.kt b/app/src/main/java/org/digitalcampus/oppiamobile/data/user/di.kt
@@ -10,8 +10,8 @@ import org.digitalcampus.oppiamobile.data.user.remote.auth.AuthRemoteService
 import org.digitalcampus.oppiamobile.data.user.repository.UserDbDataSource
 import org.digitalcampus.oppiamobile.data.user.repository.UserRemoteDataSource
 import org.digitalcampus.oppiamobile.data.user.repository.UserRepository
-import org.digitalcampus.oppiamobile.domain.use_cases.UserLoginLocalUseCase
-import org.digitalcampus.oppiamobile.domain.use_cases.UserLoginRemoteUseCase
+import org.digitalcampus.oppiamobile.domain.useCases.UserLoginLocalUseCase
+import org.digitalcampus.oppiamobile.domain.useCases.UserLoginRemoteUseCase
 import retrofit2.Retrofit
 import retrofit2.create
 import javax.inject.Singleton

diff --git a/app/src/main/java/org/digitalcampus/oppiamobile/data/user/repository/DataMappers.kt b/app/src/main/java/org/digitalcampus/oppiamobile/data/user/repository/DataMappers.kt
@@ -4,3 +4,6 @@ import org.digitalcampus.oppiamobile.data.user.db.entity.UserEntity
 import org.digitalcampus.oppiamobile.domain.model.User
 
 fun UserEntity.toUser() = User(email, username, first_name, last_name, api_key)
+
+
+// TODO COMENTAR  criterio de nombres de archivos: ficheros que no son clases? nombres de paquetes?
diff --git a/app/src/main/java/org/digitalcampus/oppiamobile/ui/auth/login/LoginFragment.kt b/app/src/main/java/org/digitalcampus/oppiamobile/ui/auth/login/LoginFragment.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import org.digitalcampus.oppia.fragments.AppFragment
 import org.digitalcampus.oppiamobile.R

diff --git a/app/src/main/java/org/digitalcampus/oppiamobile/ui/auth/login/LoginViewModel.kt b/app/src/main/java/org/digitalcampus/oppiamobile/ui/auth/login/LoginViewModel.kt
@@ -7,9 +7,9 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.digitalcampus.oppiamobile.domain.useCases.TestApiClientUseCase
 import org.digitalcampus.oppiamobile.domain.useCases.UserLoginLocalUseCase
 import org.digitalcampus.oppiamobile.domain.useCases.UserLoginRemoteUseCase
+import org.digitalcampus.oppiamobile.domain.use_cases.TestApiClientUseCase
 import org.digitalcampus.oppiamobile.ui.common.AppViewModel
 import org.digitalcampus.oppiamobile.utils.ConnectivityUtils
 import javax.inject.Inject