chore: update deps (#307)

xmartlabs · Jun 18, 2024 · 0c89052 · 0c89052
1 parent 1d865d1
commit 0c89052
Show file tree

Hide file tree

Showing 31 changed files with 266 additions and 98 deletions.
diff --git a/.github/workflows/check_compile.yml b/.github/workflows/check_compile.yml
@@ -19,6 +19,10 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Gradle Initialization
         run: ./gradlew
       - name: Check forbidden comments
@@ -53,6 +57,10 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Build App
         run: ./gradlew build
       - name: Upload Report

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,9 +1,10 @@
 plugins {
-    id "com.android.application"
+    id 'com.android.application'
     id "kotlin-android"
     id "kotlin-parcelize"
     id "kotlin-kapt"
     id "org.jetbrains.kotlin.plugin.serialization"
+    id 'com.google.devtools.ksp'
     alias(libs.plugins.easyLauncher)
 }
 
@@ -20,9 +21,6 @@ if (getEnvVariable('KEYSTORE_FILE') != null) {
 
 // TODO: Setup Crashlytics
 def CRASHLYTICS_ENABLED = false
-if (CRASHLYTICS_ENABLED) {
-    apply plugin: 'com.google.firebase.crashlytics'
-}
 
 
 android {
@@ -44,6 +42,7 @@ android {
 
     buildFeatures {
         compose true
+        buildConfig = true
     }
 
     signingConfigs {
@@ -68,8 +67,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    flavorDimensions "env"
+    flavorDimensions = ["env"]
     productFlavors {
         dev {
             buildConfigField 'String', 'API_BASE_URL', getEnvVariable('API_DEV_SERVER_URL')
@@ -85,38 +83,36 @@ android {
     }
 
     packagingOptions {
-        exclude 'META-INF/LICENSE' // will not include LICENSE file
+        resources {
+            excludes += ['META-INF/LICENSE']
+        }
     }
 
-    lintOptions {
-        lintConfig file("lint.xml")
-        disable "ObsoleteLintCustomCheck"
-        fatal 'StopShip'
-        warningsAsErrors true
-    }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        languageVersion = "1.5"
-        jvmTarget = '11'
+        languageVersion = "1.9"
+        jvmTarget = '17'
         freeCompilerArgs += [
-                "-XXLanguage:+InlineClasses",
                 "-Xallow-result-return-type",
-                "-Xopt-in=kotlin.RequiresOptIn",
-                "-Xuse-experimental=kotlin.contracts.ExperimentalContracts",
-                "-Xuse-experimental=kotlin.Experimental",
-                "-Xuse-experimental=kotlin.time.ExperimentalTime",
-                "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                "-Xuse-experimental=kotlinx.coroutines.FlowPreview",
-                "-Xuse-experimental=kotlin.ExperimentalStdlibApi",
+                "-opt-in=kotlin.RequiresOptIn",
+                "-opt-in=kotlin.contracts.ExperimentalContracts",
         ]
     }
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.core.get()
+        kotlinCompilerExtensionVersion = "1.5.13"
+    }
+    namespace 'com.xmartlabs.gong'
+    lint {
+        disable 'ObsoleteLintCustomCheck'
+        disable 'AndroidGradlePluginVersion'
+        fatal 'StopShip'
+        lintConfig file('lint.xml')
+        warningsAsErrors true
     }
 }
 
@@ -132,6 +128,8 @@ dependencies {
     implementation libs.androidX.dataStore
     implementation libs.coil
     implementation libs.once
+    implementation platform(libs.firebase.bom)
+    implementation libs.firebase.analytics
     implementation libs.firebase.crashlytics
     implementation libs.koin.compose
     implementation libs.timber
@@ -143,7 +141,7 @@ dependencies {
     implementation libs.bundles.kotlin
     implementation libs.bundles.networking.core
 
-    kapt libs.androidX.room.compiler
+    ksp libs.androidX.room.compiler
 
     testImplementation libs.junit
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -40,3 +40,12 @@
     kotlinx.serialization.KSerializer serializer(...);
 }
 ### End Kotlin serializer
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
diff --git a/app/src/dev/AndroidManifest.xml b/app/src/dev/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.xmartlabs.gong"
-    >
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application android:name=".App" />
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,9 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.xmartlabs.gong"
     >
-
     <!--  TODO: Remove networkSecurityConfig -->
     <application
         android:allowBackup="false"
@@ -14,7 +12,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:targetApi="n"
+        android:fullBackupContent="false"
+        tools:targetApi="34"
+        android:dataExtractionRules="@xml/data_extraction_rules"
         >
 
         <!-- Enabled in the application -->

diff --git a/app/src/main/java/com/xmartlabs/gong/data/repository/auth/UserLocalSource.kt b/app/src/main/java/com/xmartlabs/gong/data/repository/auth/UserLocalSource.kt
@@ -23,4 +23,8 @@ class UserLocalSource {
         delay(30)
         return requireNotNull(localUsers[userId])
     }
+
+    fun deleteUser(user: User) {
+        localUsers.remove(user.id)
+    }
 }
diff --git a/app/src/main/java/com/xmartlabs/gong/data/service/NetworkLayerCreator.kt b/app/src/main/java/com/xmartlabs/gong/data/service/NetworkLayerCreator.kt
@@ -9,17 +9,18 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import java.util.concurrent.TimeUnit
-import kotlin.time.Duration
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 /**
  * Created by mirland on 28/04/20.
  */
 object NetworkLayerCreator {
     @SuppressWarnings("MagicNumber")
-    private val HTTP_CONNECT_TIMEOUT = Duration.seconds(20)
+    private val HTTP_CONNECT_TIMEOUT = 20.toDuration(DurationUnit.SECONDS)
 
     @SuppressWarnings("MagicNumber")
-    private val HTTP_READ_TIMEOUT = Duration.seconds(20)
+    private val HTTP_READ_TIMEOUT = 20.toDuration(DurationUnit.SECONDS)
     private val JSON_MEDIA_TYPE = "application/json".toMediaType()
 
     fun createOkHttpClientBuilder(

diff --git a/app/src/main/java/com/xmartlabs/gong/device/di/UseCaseDiModule.kt b/app/src/main/java/com/xmartlabs/gong/device/di/UseCaseDiModule.kt
@@ -4,6 +4,7 @@ import com.xmartlabs.gong.domain.usecase.GetLocationUseCase
 import com.xmartlabs.gong.domain.usecase.GetSessionTypeUseCase
 import com.xmartlabs.gong.domain.usecase.LoadUserUseCase
 import com.xmartlabs.gong.domain.usecase.SignInUseCase
+import com.xmartlabs.gong.domain.usecase.SignOutUseCase
 import com.xmartlabs.gong.domain.usecase.TimeTrackerUseCase
 import org.koin.dsl.module
 
@@ -15,6 +16,7 @@ object UseCaseDiModule {
         factory { GetLocationUseCase(get(), get(DEFAULT_DISPATCHER)) }
         factory { GetSessionTypeUseCase(get(), get(DEFAULT_DISPATCHER)) }
         factory { LoadUserUseCase(get(), get(DEFAULT_DISPATCHER)) }
+        factory { SignOutUseCase(get(), get(DEFAULT_DISPATCHER)) }
         factory { SignInUseCase(get(), get(DEFAULT_DISPATCHER)) }
         factory { TimeTrackerUseCase(get(DEFAULT_DISPATCHER)) }
     }

diff --git a/app/src/main/java/com/xmartlabs/gong/device/di/ViewModelDiModule.kt b/app/src/main/java/com/xmartlabs/gong/device/di/ViewModelDiModule.kt
@@ -13,6 +13,6 @@ object ViewModelDiModule {
     val viewModels = module {
         viewModel { SignInScreenViewModel(get()) }
         viewModel { MainActivityViewModel(get()) }
-        viewModel { WelcomeScreenViewModel(get(), get()) }
+        viewModel { WelcomeScreenViewModel(get(), get(), get()) }
     }
 }
diff --git a/app/src/main/java/com/xmartlabs/gong/domain/repository/UserRepository.kt b/app/src/main/java/com/xmartlabs/gong/domain/repository/UserRepository.kt
@@ -3,6 +3,7 @@ package com.xmartlabs.gong.domain.repository
 import com.xmartlabs.gong.data.repository.auth.UserLocalSource
 import com.xmartlabs.gong.data.repository.auth.UserRemoteSource
 import com.xmartlabs.gong.data.repository.session.SessionLocalSource
+import kotlinx.coroutines.flow.first
 
 /**
  * Created by mirland on 25/04/20.
@@ -21,6 +22,12 @@ class UserRepository(
                 response.user
             }
 
+    suspend fun signOut(): Unit =
+        sessionLocalSource.getSessionUser().first()
+            ?.let { response ->
+                userLocalSource.deleteUser(response)
+            } ?: Unit
+
     fun getCurrentUser() = sessionLocalSource.getSessionUser()
 
     suspend fun getUser(userId: String) = userLocalSource.getUser(userId)

diff --git a/app/src/main/java/com/xmartlabs/gong/domain/usecase/SignOutUseCase.kt b/app/src/main/java/com/xmartlabs/gong/domain/usecase/SignOutUseCase.kt
@@ -0,0 +1,13 @@
+package com.xmartlabs.gong.domain.usecase
+
+import com.xmartlabs.gong.domain.repository.UserRepository
+import com.xmartlabs.gong.domain.usecase.common.CoroutineUseCase
+import kotlinx.coroutines.CoroutineDispatcher
+
+class SignOutUseCase(
+    private val userRepository: UserRepository,
+    dispatcher: CoroutineDispatcher,
+) : CoroutineUseCase<Unit, Unit>(dispatcher) {
+
+    override suspend fun execute(params: Unit): Unit = userRepository.signOut()
+}
diff --git a/app/src/main/java/com/xmartlabs/gong/domain/usecase/TimeTrackerUseCase.kt b/app/src/main/java/com/xmartlabs/gong/domain/usecase/TimeTrackerUseCase.kt
@@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.flow
 import timber.log.Timber
 import java.util.Date
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.DurationUnit
 
 /**
@@ -22,7 +23,7 @@ class TimeTrackerUseCase(
         while (true) {
             @Suppress("MagicNumber")
             delay(1800)
-            val duration = Duration.milliseconds((Date().time - params.startTime.time))
+            val duration = (Date().time - params.startTime.time).milliseconds
             Timber.d("Duration: %s in millis", duration.toDouble(DurationUnit.MILLISECONDS))
             emit(duration)
         }

diff --git a/app/src/main/java/com/xmartlabs/gong/ui/MainActivity.kt b/app/src/main/java/com/xmartlabs/gong/ui/MainActivity.kt
@@ -18,15 +18,15 @@ import com.xmartlabs.gong.domain.usecase.SessionType
 import com.xmartlabs.gong.ui.screens.signin.SignInScreen
 import com.xmartlabs.gong.ui.screens.welcome.WelcomeScreen
 import com.xmartlabs.gong.ui.theme.AppTheme
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
-import kotlin.time.Duration
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 class MainActivity : ComponentActivity() {
     companion object {
-        private val SPLASH_ANIMATION_TIME = Duration.milliseconds(300)
+        private val SPLASH_ANIMATION_TIME = 300.toDuration(DurationUnit.MILLISECONDS)
     }
 
     private val viewModel: MainActivityViewModel by viewModel()
@@ -88,7 +88,7 @@ fun AppNavigationManager(sessionType: SessionType) {
             SignInScreen(navController = navigationController)
         }
         composable(Screens.WELCOME) {
-            WelcomeScreen()
+            WelcomeScreen(navController = navigationController)
         }
     }
 }
diff --git a/app/src/main/java/com/xmartlabs/gong/ui/common/BaseViewModel.kt b/app/src/main/java/com/xmartlabs/gong/ui/common/BaseViewModel.kt
@@ -80,8 +80,8 @@ abstract class BaseViewModel<Action, OneShotEvent, State>(initialState: State) :
         launch { this@BaseViewModel.withState(block) }
     }
 
-    protected inline fun <T> Flow<ProcessState<T>>.watchProcessState(
-        crossinline action: suspend (ProcessState<T>) -> Unit,
+    protected fun <T> Flow<ProcessState<T>>.watchProcessState(
+        action: suspend (ProcessState<T>) -> Unit,
     ) = viewModelScope.launch {
         collect(action)
     }

diff --git a/app/src/main/java/com/xmartlabs/gong/ui/screens/signin/SignInScreen.kt b/app/src/main/java/com/xmartlabs/gong/ui/screens/signin/SignInScreen.kt
@@ -66,6 +66,7 @@ private fun SignInEvents(
                     popUpTo(Screens.SIGN_IN) { inclusive = true }
                 }
             is SignInViewModelEvent.SignInError -> showSignInError(event.throwable, context)
+            else -> Unit
         }
     }
 }
@@ -125,6 +126,7 @@ fun SignInContent(
         ConstraintLayout(
             modifier = Modifier
                 .fillMaxSize()
+                .padding(it)
                 .padding(start = 15.dp, end = 15.dp)
         ) {
             val (welcomeText, signInText, userIdEditText, passwordEditText, signInButton) = createRefs()

diff --git a/app/src/main/java/com/xmartlabs/gong/ui/screens/signin/SignInScreenViewModel.kt b/app/src/main/java/com/xmartlabs/gong/ui/screens/signin/SignInScreenViewModel.kt
@@ -26,6 +26,7 @@ class SignInScreenViewModel(
                     when (state) {
                         is ProcessState.Failure -> sendOneShotEvent(SignInViewModelEvent.SignInError(state.exception))
                         is ProcessState.Success -> sendOneShotEvent(SignInViewModelEvent.NavigateToDashboard)
+                        ProcessState.Loading -> Unit
                     }
                 }
         }