Merge pull request #2 from DigitalCampus/ci

Run Ktlint before sonar

.editorconfig

@@ -1,4 +1,5 @@
 root = true
 
 [*.{kt,kts}]
-ktlint_standard_final-newline = disabled
+# Disable here specific ktlint rules
+#ktlint_standard_final-newline = disabled

.github/workflows/release.yml

@@ -2,7 +2,6 @@ name: GitHub Release
 
 on:
   push:
-    branches: master
     tags:
       - v*
 

app/build.gradle.kts

@@ -1,4 +1,5 @@
 import com.android.build.gradle.internal.api.BaseVariantOutputImpl
+import com.android.build.gradle.internal.tasks.factory.dependsOn
 
 plugins {
     id("com.android.application")
@@ -116,13 +117,14 @@ dependencies {
 ktlint {
     android.set(true)
     version.set("0.50.0")
-    ignoreFailures.set(false)
+    ignoreFailures.set(true)
     reporters {
         reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
         reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.HTML)
     }
 }
 
+tasks.sonar.dependsOn("ktlintCheck")
 sonar {
     properties {
         property("sonar.projectName", "Oppia Mobile APP")
@@ -143,4 +145,4 @@ sonar {
         property("sonar.junit.reportPaths", "**/test-results/**/*.xml")
         property("sonar.coverage.jacoco.xmlReportPaths", "build/reports/coverage/androidTest/debug/connected/report.xml")
     }
-}
+}

app/src/androidTest/java/org/digitalcampus/oppiamobile/ExampleInstrumentedTest.kt

@@ -19,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("org.digitalcampus.mobile.learning", appContext.packageName)
     }
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/application/App.kt

@@ -4,4 +4,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class App : Application()
+class App : Application()

app/src/main/java/org/digitalcampus/oppiamobile/data/config/db/AppDatabase.kt

@@ -39,4 +39,4 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun customFieldDao(): CustomFieldDao
     abstract fun preferencesDao(): PreferencesDao
     abstract fun courseDao(): CourseDao
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/data/config/db/BaseDao.kt

@@ -43,4 +43,4 @@ interface BaseDao<T> {
 
     @Delete
     suspend fun deleteAll(list: List<T>): Int
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/data/course/db/dao/CourseDao.kt

@@ -16,4 +16,4 @@ interface CourseDao : BaseDao<CourseEntity> {
 
     @Query("SELECT EXISTS(SELECT * FROM course WHERE shortname = :shortname)")
     fun isInstalled(shortname: String): Boolean
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/data/user/db/dao/UserDao.kt

@@ -10,4 +10,4 @@ interface UserDao : BaseDao<UserEntity> {
 
     @Query("SELECT * FROM user WHERE username = :username")
     suspend fun getByUsername(username: String): UserEntity?
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/data/user/db/entity/UserEntity.kt

@@ -26,4 +26,4 @@ data class UserEntity(
 )
 
 val UserEntity.passwordEncrypted: String
-    get() = CryptoUtils.encryptLocalPassword(password)
+    get() = CryptoUtils.encryptLocalPassword(password)

app/src/main/java/org/digitalcampus/oppiamobile/data/user/remote/auth/AuthRemoteService.kt

@@ -7,4 +7,4 @@ interface AuthRemoteService {
 
     @POST("user/")
     suspend fun login(@Body loginRequest: LoginRequest): LoginResponse
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/data/user/remote/auth/LoginResponse.kt

@@ -19,4 +19,4 @@ data class LoginResponse(
     val badging: Boolean,
     @SerializedName("api_key")
     val apiKey: String,
-)
+)

app/src/main/java/org/digitalcampus/oppiamobile/data/user/repository/UserDbDataSource.kt

@@ -9,4 +9,4 @@ class UserDbDataSource @Inject constructor(private val userDao: UserDao) {
     suspend fun updateUser(user: UserEntity) = userDao.update(user)
 
     suspend fun getByUsername(username: String) = userDao.getByUsername(username)
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/data/user/repository/UserRemoteDataSource.kt

@@ -17,4 +17,4 @@ class UserRemoteDataSource @Inject constructor(private val authRemoteService: Au
             response.apiKey,
         )
     }
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/data/user/repository/UserRepository.kt

@@ -28,4 +28,4 @@ class UserRepository @Inject constructor(
     }
 
     suspend fun getLocalUserByUsername(username: String) = authDbDataSource.getByUsername(username)
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/data/utils/converters/DateConverters.kt

@@ -14,4 +14,4 @@ class DateConverters {
     fun dateToTimestamp(date: Date?): Long? {
         return date?.time
     }
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/di/AppModule.kt

@@ -87,4 +87,4 @@ class AppModule {
     fun provideUserLoginLocalUseCase(userRepository: UserRepository) = UserLoginLocalUseCase(userRepository)
 
     // TODO COMENTAR aquí se pueden llegar a crear muchísimos Provides, organizamos por funcionalidad o modelo?
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/di/ViewModelModule.kt

@@ -6,4 +6,4 @@ import dagger.hilt.android.components.ViewModelComponent
 
 @Module
 @InstallIn(ViewModelComponent::class)
-class ViewModelModule
+class ViewModelModule

app/src/main/java/org/digitalcampus/oppiamobile/domain/useCases/CheckFieldNotEmpty.kt

@@ -3,4 +3,4 @@ package org.digitalcampus.oppiamobile.domain.useCases
 class CheckFieldNotEmpty {
 
     fun check(text: String?) = text?.isNotBlank() ?: false
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/domain/useCases/UserLoginLocalUseCase.kt

@@ -24,4 +24,4 @@ class UserLoginLocalUseCase @Inject constructor(
             }
         }
     }
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/domain/useCases/UserLoginRemoteUseCase.kt

@@ -14,4 +14,4 @@ class UserLoginRemoteUseCase @Inject constructor(
         Log.d("UserLoginRemoteUseCase", "doLogin: User: $user")
         return user
     }
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/ui/auth/AuthActivity.kt

@@ -137,4 +137,4 @@ class AuthActivity : AppCompatActivity() {
 //        FetchUserTask().updateLoggedUserProfile(this, apiEndpoint, user)
 //        finish()
 //    }
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/ui/auth/login/LoginFragment.kt

@@ -97,4 +97,4 @@ class LoginFragment : AppFragment() {
 //            }
 //        }
 //    }
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/ui/auth/login/LoginViewModel.kt

@@ -71,4 +71,4 @@ class LoginViewModel @Inject constructor(
             }
         }
     }
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/ui/common/ActivityPagerAdapter.kt

@@ -54,4 +54,4 @@ class ActivityPagerAdapter(
             updateTabLayout(tabs.getTabAt(i), R.layout.tablayout_fixed_tab, tabTitles[i])
         }
     }
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/ui/common/AppFragment.kt

@@ -44,4 +44,4 @@ open class AppFragment : Fragment() {
 
     protected val isProgressDialogShowing: Boolean
         get() = progressDialog != null && progressDialog!!.isShowing
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/ui/common/AppViewModel.kt

@@ -4,4 +4,4 @@ import androidx.lifecycle.ViewModel
 
 open class AppViewModel : ViewModel() {
     val TAG = this::class.simpleName
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/utils/ConnectivityUtils.kt

@@ -26,4 +26,4 @@ class ConnectivityUtils(private val context: Context) {
             return connectivityManager.activeNetworkInfo?.isConnected ?: false
         }
     }
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/utils/CryptoUtils.kt

@@ -39,4 +39,4 @@ object CryptoUtils {
         }
         return ""
     }
-}
+}

app/src/main/java/org/digitalcampus/oppiamobile/utils/UIUtils.kt

@@ -266,4 +266,4 @@ object UIUtils {
 //            .setNegativeButton(context.getString(R.string.cancel), null)
 //            .show()
 //    }
-}
+}

app/src/test/java/org/digitalcampus/oppiamobile/ExampleUnitTest.kt

@@ -13,4 +13,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
+}